Merging a stable package from gh-pages into master