Merge commit 'origin/stable'

No match.