groovy-ant part of PR#456