Fix for Mandrill compilation
Merge remote-tracking branch 'origin/mandrilldevel' into mandrilldevel