local remote test 2
Merge branch 'master' of github.com:fergusb/zsh

* 'master' of github.com:fergusb/zsh:
  local remote test