ant build fix
Merge branch 'master' into v2.2.0