fix bug http://bugs.openmw.org/issues/1470
Merge remote-tracking branch 'origin/master'