Merge branch 'release' into bug-1195

No match.