Merge remote-tracking branch 'upstream/v4.3' into v4.3
Merge branch 'v4.3' of github.com:m038/Newscoop into v4.3
Merge remote-tracking branch 'upstream/v4.3' into v4.3
Merge remote-tracking branch 'origin/v4.3' into WOBS-3528_template_preferences
Forces TinyMCE for image captions to always enclode text in a p-tag