This was apparently causing some errors on windows machines...
Merge branch 'master' into gh-pages