Merged from master branch, post 1.1 release.