Run inliner on loaded email templates
Merge remote-tracking branch 'origin/master'
Don't run inliner when loading a template in backend