pre-1.1 release update

This pull request updates staged changes to master branch prior to the 1.1 release.