Merge garderner-1.0 command line argument change patch from master.