Master

Includes fix for issues https://bugs.openmw.org/issues/1046 and https://bugs.openmw.org/issues/1026