Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master

author David Yip <yipdw@member.fsf.org>

Sun, 7 Jan 2018 19:30:52 +0000 (13:30 -0600)

committer David Yip <yipdw@member.fsf.org>

Sun, 7 Jan 2018 19:30:52 +0000 (13:30 -0600)
author David Yip <yipdw@member.fsf.org>
Sun, 7 Jan 2018 19:30:52 +0000 (13:30 -0600)
committer David Yip <yipdw@member.fsf.org>
Sun, 7 Jan 2018 19:30:52 +0000 (13:30 -0600)
diff --cc app/controllers/application_controller.rb
Simple merge
author	David Yip <yipdw@member.fsf.org>
	Sun, 7 Jan 2018 19:30:52 +0000 (13:30 -0600)
committer	David Yip <yipdw@member.fsf.org>
	Sun, 7 Jan 2018 19:30:52 +0000 (13:30 -0600)