Merge pull request #4947 from eileenmcnaughton/examples