Merge pull request #1410 from alesliehughes/master