Commit 37e9278220095435d986e7412d2a97097dab3221

Edward Thomson 2016-06-21T13:26:29

Merge pull request #3834 from pks-t/pks/cleanups Cleanups