#gt-14 In Progress
#gt-12 Fixed, #gt-14 Fixed
Merge remote-tracking branch 'origin/master'

Conflicts:
	test/fixtures/recipients.yml