- #2177309 by galindus_olidop, TwoD: Fixed names for custom formats in CKEditor.
- #1956778 by mibfire, rocketeerbkw, guillaumev: Added support for configuring CKEditor's Advanced Content Filter.
- #2186591 by joelcollinsdc, TwoD: Fixed disabled formats causing noticed on Admin Menu rebuilds.
- #1793704 by ultimike, zhangtaihao, TwoD: Allow altering of CSS paths.
Adjusted the placement of the "Disable rich-text" link.
- #2054885 by tswaters, TwoD: Fixed adding blank stylesheet in CKEditor proxy plugin function.
Applied patch wysiwyg-741606.45.patch from
https://drupal.org/comment/8431115#comment-8431115 to add
Teaser splitter / text fields with summary support
Merge branch '7.x-2.x-wwm-741606-55'

Conflicts:
	wysiwyg.js
Merge branch 'origin/7.x-2.x'