Merges master in to gh-pages