Reapply changes made to gh-pages/master_0.5 source