Merge branch 'master' of https://github.com/meaglyn/nwn-tools
Merge branch 'master' of https://github.com/meaglyn/nwn-tools