Merge remote-tracking branches 'quietust/master' and 'jjyg/master'
Merge branch 'master' of https://github.com/DFHack/df-structures