Another hack for droid on windows
Merge branch 'scaleconf2013' into gh-pages