Fix bug when use themes from bundle/plugin
Merge branch 'master' into open_badge