Merge remote-tracking branch 'upstream/master' into feature/slurp-upstream

Conflicts:
	handlers/notification/slack.rb
	plugins/graphite/check-data.rb