Further alignment with upstream
Merge branch 'develop' into gh-pages