fix content_for
fix content_for blocks
Merge branch 'master' into 1-2-stable