Commit dc9bdf143a1b5f19435a76e16a916817e1c255bf

DRC 2018-04-12T17:02:10

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