Fixing build script
Merge branch 'master' into io-2013