Another try at fixing chrome on windows
Merge branch 'scaleconf2013' into gh-pages