Misc. bug fixes, Ant build script.
Merge remote-tracking branch 'origin/master'