Add the -D/--debug option.
Merge branch 'debug' into incoming