Merge pull request #1699 from eileenmcnaughton/master