fix mandrill
Merge branch 'master' of github.com:Benoitlecorre/airflat