Merge branch 'master'; commit 'origin/stable'