Workaround for broken template minify
Merge remote-tracking branch 'rohan/master'