port to 0.9.5
Merge branch 'master' of github.com:macrosoft/wotrc