Merge branch 'stable' into gh-pages