Merge branch 'master' of github:jjyg/dfhack