From: Kalle Valo <redacted>
Date: Sun, 30 Oct 2016 11:20:46 +0200

few fixes for 4.9. I tagged this on the plane over a slow mosh
connection while travelling to Plumbers so I might have done something
wrong, please check more carefully than usually. For example I had to
redo the signed tag because of some whitespace damage.

Please let me know if there are any problems.

Your subject line says "-next" but clearly these are bug fixes for 'net'
so that's where I pulled this into.

Thanks.