Merged changes from defunct release branch.