Merge branch 'hotfix/h10' into production
Merge branch 'release/r6' into production
#NonStupidDigestAssets.whitelist = Ckeditor.assets
Merge branch 'hotfix/h11'