Merge remote-tracking branch 'scrawl/companion'
Merge branch 'master' of git://github.com/zinnschlag/openmw into bug688