vagrant
Merge branch 'gh-pages-dev' into gh-pages