Merge branch 'master' into gh-pages
Customize to Vanessa
Merge branch 'gh-pages'