Merge branch 'master' into url-command
Add completion.