Develop

Pulled in develop to check for fixes in pre 1.1.0.