[ issue 1202 ] Fixed by reminding user of hidden args
Merge branch 'Issue1202'
Merge remote-tracking branch 'upstream/master'