Merge branch 'next' into weapon_shield

Conflicts:
	apps/openmw/mwrender/npcanimation.cpp