fix for https://bugs.openmw.org/issues/569
Merge remote-tracking branch 'lazydev/master'