Merge pull request #2492 from colemanw/ac