Merge remote-tracking branch 'upstream/master'

Conflicts:
	lib/griddler/adapters/mailgun_adapter.rb
	lib/griddler/email.rb