handlebars
avoid endless loop on locked oneoff content types.
Merge branch 'develop'