took out include mime
Merge branch 'staging'