Merge to master before develop

Commit

9 years ago

Merge to master before develop This avoids picking up things which have been landed on develop since the release process started.