Merge branch 'hotfix/export-cache'
Merge branch 'master' of code.getpantheon.com:99eb1c18-5d10-447c-8b17-592bc7bd0b60 into develop
Added mandrill integration