Merge hotfix to gh-pages