Mandrill bug fix
Merge branch 'master' into skoda