Comment 17 for bug 1638394

Thanks for the fix - reviewed :D

Would you guys like to review some of my branches, so I can get them in? You already know a lot more C++ than I did when I started doing code reviews here. To do a review, have a look at the code to see if anything rubs you the wrong way about it, and do a quick test to check if it works as expected. Travis will take care of regression tests etc. And if you miss a bug, it's not the end of the world :)