Merge pull request #1526 from eileenmcnaughton/master