my changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	grails-app/domain/grails/plugin/asyncmail/AsynchronousMailMessage.groovy
	test/unit/grails/plugin/asyncmail/AsynchronousMailMessageTests.groovy