same as https://github.com/OpenMW/openmw/pull/2005 but without the last commit which only moved files around.