Fixes #1347 (new license argument / dialog for init command)
Merge remote-tracking branch 'miklosm/iss1347'