Commit 1a85fc497db85e1bf8b026d51cf6e5dec391d224

DRC 2018-05-21T12:07:40

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