[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth