Merge tag '1.3.0' into develop

v1.3.0

New:
- Can now provide a list of default switches from a config file
Fix: support more scenarios for merging defaults and a command-line override
Version bump
Merge branch 'release/1.3.1'