Commit b628d6934ffdbbdad2956618c639673c5c715a23

DRC 2018-04-08T12:49:05

Additional code formatting tweaks ... detected with an improved version of our checkstyle script