Merge pull request #1611 from eileenmcnaughton/master