Merge pull request #1030 from eileenmcnaughton/master