Commit a03952f09547cc72c8edda503aac8ab9652f3c98

Edward Thomson 2015-09-25T12:44:14

patch: formatting cleanups