Merge pull request #2841 from pyhalov/ant