Bug fixes for follow/unfollow users/vendors
Merge remote-tracking branch 'upstream/master'