Merge branch 'stable' into hotline-master