Fixed a bug in build.xml
Merge remote-tracking branch 'origin/masterbranch' into masterbranch