Increase number of recent branches
gpsh now automatically sets up tracking for the current branch name
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  gpsh now automatically sets up tracking for the current branch name
  Increase number of recent branches