change to build
Squashed Awein's automatic update commits
various changes for 1.1x