Slightly easier to pass compilerargs to Ant
Merge branch 'devel' into devel-ci
Dev version, 130929