Merge remote-tracking branch 'origin/master' into pull-2386

Fixes `current_branch` -> `git_current_branch`.
Update comment for `is_recent_git_version`.

Conflicts:
	lib/git.zsh