Merge pull request #264 from expwnent/master

DFHack 0.34.11-r5

(merging my own pull request is a little silly)
Merge pull request #265 from DFHack/develop

Merge 0.34.11-r5 into master