Merge bugfix into release branch

No match.