UTF-8 encoding was added in ant build.
Merge remote-tracking branch 'origin/develop' into develop