Merge tag '1.3.1' into develop

v1.3.1

Fixes:
* support more scenarios for merging config-file defaults and command-line overrides
Fix: whitespace
Fix: remove debugging output
Version bump
Merge branch 'release/1.3.2'