Merge branch 'stable' into stable-master-merge