Fix http://openeye.openmods.info/crashes/b388bb0423a9cc21cb4d9b4e0020e1c8
Merge remote-tracking branch 'origin/master' into 1.7.2