Fix short version of debug flag
Merge branch 'output_control' into hamish

* output_control:
  Fix short version of debug flag