From: Kalle Valo <[email protected]> Date: Mon, 25 Apr 2016 19:13:20 +0300
> few fixes for 4.6, more info in the signed tag below. I'm hoping this to > be the final pull request for 4.6 but let's see how it goes. Please let > me know if there are any problems. Pulled, thanks.
