Actually check in the new TAZ settings
Merge remote-tracking branch 'origin/1.0.5' into development