Merge branch 'stable' into upstream-master