Fixed Ant build script
Merge branch 'master' into API10