Merge branch 'cmdline'