fix @lukasa's lack of taste :)

#1702
Merge remote-tracking branch 'origin/master'