New upstream release

* Update for merge into upstream master branch.