Merge fix from gh-pages to master