Bug 788
Merge remote-tracking branch 'riothamus/riothamus-b788' into openmw24