Merged Rafael Oliveira's (@rafaelbco) @content-core views
from collective.cmfeditionsdexteritycompat.