Merge pull request #1252 from alesliehughes/master