Merge pull request #2517 from eileenmcnaughton/examples