Add Mandrill tags

Signed-off-by: Maxime Gaillard <maxime@naeka.fr>
Merge branch 'hotfix/2014-02.2.1'