Merge branch 'master' into url-command

Conflicts:
	completion/_feature
	completion/_hotfix
	completion/bash_completion.sh
	lib/github.rb