Merge branch 'master' of https://github.com/mr-martian/quest-editor