ApplicationAware of EmailSender in order to get Spring context.
Merge remote-tracking branch 'origin/master'