Merge pull request #3439
3c95599 init: add better formating for some command-line options (Philip Kaufmann)