2013.09.20 (1.48d6)
Merge remote-tracking branch 'upstream/master'
compatibility with ant
Merge branch 'master' of https://github.com/aschain/imagej1