bootstrap updates including issue #1116
Merge pull request #1144 from stevewithington/develop

bootstrap updates including issue #1116