Merging release into master

Committed on the wrong branch.