Merge pull request #1447 from colemanw/master