Merge remote-tracking branch 'dfhack/develop' into 0.40.08-r2
Update to r2.
Tweaks.
Merge remote-tracking branch 'dfhack/master' into 0.40.08-r2
Update isoworld.
Merge remote-tracking branch 'dfhack/master' into 0.40.08-r2

Conflicts:
	plugins/isoworld