Merge remote-tracking branch 'upstream/master'

* upstream/master:
  Remove tagbar settings [Fix #464]
  Fix Ag functions