Merge pull request #1544 from eileenmcnaughton/master