Release

Merge hotfix patches through to master