Merge pull request #2514 from colemanw/ac2