Merge branch 'release' into bug-985

No match.