Major updates including adding Mandrill support