this seems like a bad fix...
Merge branch 'pages' into gh-pages