Merge pull request #8437 from SvenDowideit/un-pto-sven-oct-2014

back from camping, and making fred the docs 'guy in charge'