disalowed blockexpression outside templates
Merge remote-tracking branch 'origin/master'