59 files changed, 2188 insertions, 506 deletions
diff --git a/sources/core/_bootstrap.js b/sources/core/_bootstrap.js
index 9fcbe25..cc7fb38 100644
--- a/sources/core/_bootstrap.js
+++ b/sources/core/_bootstrap.js
@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 * For licensing, see LICENSE.md or http://ckeditor.com/license
 */
@@ -8,7 +8,7 @@
 */
 ( function() {
-        // Disable HC detection in WebKit. (#5429)
+        // Disable HC detection in WebKit. (http://dev.ckeditor.com/ticket/5429)
        if ( CKEDITOR.env.webkit )
                CKEDITOR.env.hc = false;
        else {
@@ -19,13 +19,13 @@
                hcDetect.appendTo( CKEDITOR.document.getHead() );
                // Update CKEDITOR.env.
-                // Catch exception needed sometimes for FF. (#4230)
+                // Catch exception needed sometimes for FF. (http://dev.ckeditor.com/ticket/4230)
                try {
                        var top = hcDetect.getComputedStyle( 'border-top-color' ),
                                right = hcDetect.getComputedStyle( 'border-right-color' );
                        // We need to check if getComputedStyle returned any value, because on FF
-                        // it returnes empty string if CKEditor is loaded in hidden iframe. (#11121)
+                        // it returnes empty string if CKEditor is loaded in hidden iframe. (http://dev.ckeditor.com/ticket/11121)
                        CKEDITOR.env.hc = !!( top && top == right );
                } catch ( e ) {
                        CKEDITOR.env.hc = false;
diff --git a/sources/core/ckeditor.js b/sources/core/ckeditor.js
index 2b3e5cd..95dd67a 100644
--- a/sources/core/ckeditor.js
+++ b/sources/core/ckeditor.js
@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 * For licensing, see LICENSE.md or http://ckeditor.com/license
 */
@@ -126,7 +126,7 @@ CKEDITOR.remove = function( editor ) {
        };
        /**
-         * Returns a string will all CSS rules passed to the {@link CKEDITOR#addCss} method.
+         * Returns a string with all CSS rules passed to the {@link CKEDITOR#addCss} method.
         *
         * @returns {String} A string containing CSS rules.
         */
diff --git a/sources/core/ckeditor_base.js b/sources/core/ckeditor_base.js
index 1e90d72..8c36b11 100644
--- a/sources/core/ckeditor_base.js
+++ b/sources/core/ckeditor_base.js
@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 * For licensing, see LICENSE.md or http://ckeditor.com/license
 */
@@ -33,6 +33,10 @@ if ( !window.CKEDITOR ) {
                         * by the editor code, guaranteeing clean cache results when
                         * upgrading.
                         *
+                         * **Note:** There is [a known issue where "icons.png" does not include
+                         * timestamp](http://dev.ckeditor.com/ticket/10685) and might get cached.
+                         * We are working on having it fixed.
+                         *
                         *              alert( CKEDITOR.timestamp ); // e.g. '87dm'
                         */
                        timestamp: '',                          // %REMOVE_LINE%
diff --git a/sources/core/ckeditor_basic.js b/sources/core/ckeditor_basic.js
index 847d661..c07e4d9 100644
--- a/sources/core/ckeditor_basic.js
+++ b/sources/core/ckeditor_basic.js
@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 * For licensing, see LICENSE.md or http://ckeditor.com/license
 */
diff --git a/sources/core/command.js b/sources/core/command.js
index a0e07b5..128cea4 100644
--- a/sources/core/command.js
+++ b/sources/core/command.js
@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 * For licensing, see LICENSE.md or http://ckeditor.com/license
 */
@@ -47,7 +47,7 @@ CKEDITOR.command = function( editor, commandDefinition ) {
                if ( this.state == CKEDITOR.TRISTATE_DISABLED || !this.checkAllowed() )
                        return false;
-                if ( this.editorFocus ) // Give editor focus if necessary (#4355).
+                if ( this.editorFocus ) // Give editor focus if necessary (http://dev.ckeditor.com/ticket/4355).
                        editor.focus();
                if ( this.fire( 'exec' ) === false )
diff --git a/sources/core/commanddefinition.js b/sources/core/commanddefinition.js
index 68b2253..10a040f 100644
--- a/sources/core/commanddefinition.js
+++ b/sources/core/commanddefinition.js
@@ -1,10 +1,10 @@
 /**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 * For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 /**
- * @fileOverview Defines the "virtual" {@link CKEDITOR.commandDefinition} class,
+ * @fileOverview Defines the "virtual" {@link CKEDITOR.commandDefinition} class
 *              which contains the defintion of a command. This file is for
 *              documentation purposes only.
 */
@@ -27,14 +27,14 @@
 *              } );
 *
 * @method exec
- * @param {CKEDITOR.editor} editor The editor within which run the command.
+ * @param {CKEDITOR.editor} editor The editor within which to run the command.
 * @param {Object} [data] Additional data to be used to execute the command.
 * @returns {Boolean} Whether the command has been successfully executed.
- * Defaults to `true`, if nothing is returned.
+ * Defaults to `true` if nothing is returned.
 */
 /**
- * Whether the command need to be hooked into the redo/undo system.
+ * Whether the command needs to be hooked into the redo/undo system.
 *
 *              editorInstance.addCommand( 'alertName', {
 *                      exec: function( editor ) {
@@ -52,14 +52,18 @@
 * command itself manually, and that the return value of this command is not to
 * be returned by the {@link #exec} function.
 *
- *              editorInstance.addCommand( 'loadOptions', {
+ *              editorInstance.addCommand( 'loadoptions', {
 *                      exec: function( editor ) {
+ *                              var cmd = this;
 *                              // Asynchronous operation below.
 *                              CKEDITOR.ajax.loadXml( 'data.xml', function() {
- *                                      editor.fire( 'afterCommandExec' );
+ *                                      editor.fire( 'afterCommandExec', {
+ *                                              name: 'loadoptions',
+ *                                              command: cmd
+ *                                      } );
 *                              } );
 *                      },
- *                      async: true // The command need some time to complete after exec function returns.
+ *                      async: true // The command needs some time to complete after the exec function returns.
 *              } );
 *
 * @property {Boolean} [async=false]
@@ -72,7 +76,7 @@
 *                              exec: function( editor ) {
 *                              // ...
 *                      },
- *                      editorFocus: false // The command doesn't require focusing the editing document.
+ *                      editorFocus: false // The command does not require focusing the editing document.
 *              } );
 *
 * See also {@link CKEDITOR.command#editorFocus}.
@@ -88,14 +92,14 @@
 *                      exec: function( editor ) {
 *                              // ...
 *                      },
- *                      startDisabled: true // Command is unavailable until selection is inside a link.
+ *                      startDisabled: true // The command is unavailable until the selection is inside a link.
 *              } );
 *
 * @property {Boolean} [startDisabled=false]
 */
 /**
- * Indicates that this command is sensible to the selection context.
+ * Indicates that this command is sensitive to the selection context.
 * If `true`, the {@link CKEDITOR.command#method-refresh} method will be
 * called for this command on selection changes, with a single parameter
 * representing the current elements path.
@@ -104,10 +108,10 @@
 */
 /**
- * Defined by command definition a function to determinate the command state, it will be invoked
+ * Defined by the command definition, a function to determine the command state. It will be invoked
- * when editor has it's `states` or `selection` changed.
+ * when the editor has its `states` or `selection` changed.
 *
- * **Note:** The function provided must be calling {@link CKEDITOR.command#setState} in all circumstance,
+ * **Note:** The function provided must be calling {@link CKEDITOR.command#setState} in all circumstances
 * if it is intended to update the command state.
 *
 * @method refresh
@@ -132,7 +136,7 @@
 *                      exec: function( editor ) {
 *                              // ...
 *                      },
- *                      modes: { wysiwyg:1 } // Command is available in wysiwyg mode only.
+ *                      modes: { wysiwyg:1 } // The command is available in wysiwyg mode only.
 *              } );
 *
 * See also {@link CKEDITOR.command#modes}.
@@ -146,3 +150,13 @@
 * @since 4.0
 * @property {Boolean} [readOnly=false]
 */
+/**
+ * A property that should be set when a command has no keystroke assigned by {@link CKEDITOR.editor#setKeystroke}, but
+ * the keystroke is still supported. For example: `cut`, `copy` and `paste` commands are handled that way.
+ * This property is used when displaying keystroke information in tooltips and context menus. It is used by
+ * {@link CKEDITOR.editor#getCommandKeystroke}.
+ *
+ * @since 4.6.0
+ * @property {Number} fakeKeystroke
+ */
diff --git a/sources/core/config.js b/sources/core/config.js
index 4ce98d7..f0f4aec 100644
--- a/sources/core/config.js
+++ b/sources/core/config.js
@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 * For licensing, see LICENSE.md or http://ckeditor.com/license
 */
diff --git a/sources/core/creators/inline.js b/sources/core/creators/inline.js
index a1a653c..adb402f 100644
--- a/sources/core/creators/inline.js
+++ b/sources/core/creators/inline.js
@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 * For licensing, see LICENSE.md or http://ckeditor.com/license
 */
diff --git a/sources/core/creators/themedui.js b/sources/core/creators/themedui.js
index c87d079..4e7a93e 100644
--- a/sources/core/creators/themedui.js
+++ b/sources/core/creators/themedui.js
@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 * For licensing, see LICENSE.md or http://ckeditor.com/license
 */
@@ -20,7 +20,7 @@ CKEDITOR.replaceClass = 'ckeditor';
         * Replaces a `<textarea>` or a DOM element (`<div>`) with a CKEditor
         * instance. For textareas, the initial value in the editor will be the
         * textarea value. For DOM elements, their `innerHTML` will be used
-         * instead. We recommend using `<textarea>` and `<div>` elements only.
+         * instead. It is recommended to use `<textarea>` and `<div>` elements only.
         *
         *              <textarea id="myfield" name="myfield"></textarea>
         *              ...
@@ -79,10 +79,10 @@ CKEDITOR.replaceClass = 'ckeditor';
         *              // Replace all <textarea class="myClassName"> elements in the page.
         *              CKEDITOR.replaceAll( 'myClassName' );
         *
-         *              // Selectively replace <textarea> elements, based on custom assertions.
+         *              // Selectively replace <textarea> elements, based on a custom evaluation function.
         *              CKEDITOR.replaceAll( function( textarea, config ) {
-         *                      // An assertion function that needs to be evaluated for the <textarea>
+         *                      // A function that needs to be evaluated for the <textarea>
-         *                      // to be replaced. It must explicitely return "false" to ignore a
+         *                      // to be replaced. It must explicitly return "false" to ignore a
         *                      // specific <textarea>.
         *                      // You can also customize the editor instance by having the function
         *                      // modify the "config" parameter.
@@ -109,7 +109,7 @@ CKEDITOR.replaceClass = 'ckeditor';
         *              </html>
         *
         * @param {String} [className] The `<textarea>` class name.
-         * @param {Function} [function] An assertion function that must return `true` for a `<textarea>`
+         * @param {Function} [evaluator] An evaluation function that must return `true` for a `<textarea>`
         * to be replaced with the editor. If the function returns `false`, the `<textarea>` element
         * will not be replaced.
         */
@@ -133,7 +133,7 @@ CKEDITOR.replaceClass = 'ckeditor';
                                if ( !classRegex.test( textarea.className ) )
                                        continue;
                        } else if ( typeof arguments[ 0 ] == 'function' ) {
-                                // An assertion function could be passed as the function parameter.
+                                // An evaluation function could be passed as the function parameter.
                                // It must explicitly return "false" to ignore a specific <textarea>.
                                config = {};
                                if ( arguments[ 0 ]( textarea, config ) === false )
@@ -280,10 +280,10 @@ CKEDITOR.replaceClass = 'ckeditor';
                        outer = container;
                }
-                // Set as border box width. (#5353)
+                // Set as border box width. (http://dev.ckeditor.com/ticket/5353)
                outer.setSize( 'width', width, true );
-                // WebKit needs to refresh the iframe size to avoid rendering issues. (1/2) (#8348)
+                // WebKit needs to refresh the iframe size to avoid rendering issues. (1/2) (http://dev.ckeditor.com/ticket/8348)
                contentsFrame && ( contentsFrame.style.width = '1%' );
                // Get the height delta between the outer table and the content area.
@@ -295,7 +295,7 @@ CKEDITOR.replaceClass = 'ckeditor';
                contents.setStyle( 'height', resultContentsHeight + 'px' );
-                // WebKit needs to refresh the iframe size to avoid rendering issues. (2/2) (#8348)
+                // WebKit needs to refresh the iframe size to avoid rendering issues. (2/2) (http://dev.ckeditor.com/ticket/8348)
                contentsFrame && ( contentsFrame.style.width = '100%' );
                // Emit a resize event.
@@ -309,8 +309,8 @@ CKEDITOR.replaceClass = 'ckeditor';
        /**
         * Gets the element that can be used to check the editor size. This method
-         * is mainly used by the `resize` plugin, which adds a UI handle that can be used
+         * is mainly used by the [Editor Resize](http://ckeditor.com/addon/resize) plugin, which adds
-         * to resize the editor.
+         * a UI handle that can be used to resize the editor.
         *
         * @param {Boolean} forContents Whether to return the "contents" part of the theme instead of the container.
         * @returns {CKEDITOR.dom.element} The resizable element.
@@ -337,7 +337,7 @@ CKEDITOR.replaceClass = 'ckeditor';
                        // replacement will be done later in the editor creation lifecycle.
                        element.setStyle( 'visibility', 'hidden' );
-                        // #8031 Remember if textarea was required and remove the attribute.
+                        // http://dev.ckeditor.com/ticket/8031 Remember if textarea was required and remove the attribute.
                        editor._.required = element.hasAttribute( 'required' );
                        element.removeAttribute( 'required' );
                }
@@ -422,7 +422,7 @@ CKEDITOR.replaceClass = 'ckeditor';
                        topHtml: topHtml ? '<span id="' + editor.ui.spaceId( 'top' ) + '" class="cke_top cke_reset_all" role="presentation" style="height:auto">' + topHtml + '</span>' : '',
                        contentId: editor.ui.spaceId( 'contents' ),
                        bottomHtml: bottomHtml ? '<span id="' + editor.ui.spaceId( 'bottom' ) + '" class="cke_bottom cke_reset_all" role="presentation">' + bottomHtml + '</span>' : '',
-                        outerEl: CKEDITOR.env.ie ? 'span' : 'div'       // #9571
+                        outerEl: CKEDITOR.env.ie ? 'span' : 'div'       // http://dev.ckeditor.com/ticket/9571
                } ) );
                if ( elementMode == CKEDITOR.ELEMENT_MODE_REPLACE ) {
@@ -451,7 +451,7 @@ CKEDITOR.replaceClass = 'ckeditor';
                // Disable browser context menu for editor's chrome.
                container.disableContextMenu();
-                // Redirect the focus into editor for webkit. (#5713)
+                // Redirect the focus into editor for webkit. (http://dev.ckeditor.com/ticket/5713)
                CKEDITOR.env.webkit && container.on( 'focus', function() {
                        editor.focus();
                } );
@@ -467,7 +467,7 @@ CKEDITOR.replaceClass = 'ckeditor';
 /**
 * The current editing mode. An editing mode basically provides
- * different ways of editing or viewing the contents.
+ * different ways of editing or viewing the editor content.
 *
 *              alert( CKEDITOR.instances.editor1.mode ); // (e.g.) 'wysiwyg'
 *
diff --git a/sources/core/dataprocessor.js b/sources/core/dataprocessor.js
index ebc4d1c..c42eab4 100644
--- a/sources/core/dataprocessor.js
+++ b/sources/core/dataprocessor.js
@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 * For licensing, see LICENSE.md or http://ckeditor.com/license
 */
diff --git a/sources/core/dom.js b/sources/core/dom.js
index a806a74..84aa21d 100644
--- a/sources/core/dom.js
+++ b/sources/core/dom.js
@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 * For licensing, see LICENSE.md or http://ckeditor.com/license
 */
diff --git a/sources/core/dom/comment.js b/sources/core/dom/comment.js
index 69828c2..4abb453 100644
--- a/sources/core/dom/comment.js
+++ b/sources/core/dom/comment.js
@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 * For licensing, see LICENSE.md or http://ckeditor.com/license
 */
diff --git a/sources/core/dom/document.js b/sources/core/dom/document.js
index f287245..ebf0bab 100644
--- a/sources/core/dom/document.js
+++ b/sources/core/dom/document.js
@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 * For licensing, see LICENSE.md or http://ckeditor.com/license
 */
@@ -262,7 +262,7 @@ CKEDITOR.tools.extend( CKEDITOR.dom.document.prototype, {
         * @param {String} html The HTML defining the document content.
         */
        write: function( html ) {
-                // Don't leave any history log in IE. (#5657)
+                // Don't leave any history log in IE. (http://dev.ckeditor.com/ticket/5657)
                this.$.open( 'text/html', 'replace' );
                // Support for custom document.domain in IE.
diff --git a/sources/core/dom/documentfragment.js b/sources/core/dom/documentfragment.js
index ffca9e5..1058144 100644
--- a/sources/core/dom/documentfragment.js
+++ b/sources/core/dom/documentfragment.js
@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 * For licensing, see LICENSE.md or http://ckeditor.com/license
 */
diff --git a/sources/core/dom/domobject.js b/sources/core/dom/domobject.js
index 607e9f3..f4e258a 100644
--- a/sources/core/dom/domobject.js
+++ b/sources/core/dom/domobject.js
@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 * For licensing, see LICENSE.md or http://ckeditor.com/license
 */
@@ -41,7 +41,7 @@ CKEDITOR.dom.domObject.prototype = ( function() {
                        return function( domEvent ) {
                                // In FF, when reloading the page with the editor focused, it may
                                // throw an error because the CKEDITOR global is not anymore
-                                // available. So, we check it here first. (#2923)
+                                // available. So, we check it here first. (http://dev.ckeditor.com/ticket/2923)
                                if ( typeof CKEDITOR != 'undefined' )
                                        domObject.fire( eventName, new CKEDITOR.dom.event( domEvent ) );
                        };
@@ -138,7 +138,7 @@ CKEDITOR.dom.domObject.prototype = ( function() {
                        }
                        // Remove events from events object so fire() method will not call
-                        // listeners (#11400).
+                        // listeners (http://dev.ckeditor.com/ticket/11400).
                        CKEDITOR.event.prototype.removeAllListeners.call( this );
                }
        };
diff --git a/sources/core/dom/element.js b/sources/core/dom/element.js
index b586b02..31451f9 100644
--- a/sources/core/dom/element.js
+++ b/sources/core/dom/element.js
@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 * For licensing, see LICENSE.md or http://ckeditor.com/license
 */
@@ -308,7 +308,7 @@ CKEDITOR.dom.element.clearMarkers = function( database, element, removeFromDatab
                 */
                appendText: function( text ) {
                        // On IE8 it is impossible to append node to script tag, so we use its text.
-                        // On the contrary, on Safari the text property is unpredictable in links. (#13232)
+                        // On the contrary, on Safari the text property is unpredictable in links. (http://dev.ckeditor.com/ticket/13232)
                        if ( this.$.text != null && CKEDITOR.env.ie && CKEDITOR.env.version < 9 )
                                this.$.text += text;
                        else
@@ -368,13 +368,36 @@ CKEDITOR.dom.element.clearMarkers = function( database, element, removeFromDatab
                        range.setEndAfter( parent );
                        // Extract it.
-                        var docFrag = range.extractContents( false, cloneId || false );
+                        var docFrag = range.extractContents( false, cloneId || false ),
+                                tmpElement,
+                                current;
                        // Move the element outside the broken element.
                        range.insertNode( this.remove() );
-                        // Re-insert the extracted piece after the element.
+                        // In case of Internet Explorer, we must check if there is no background-color
-                        docFrag.insertAfterNode( this );
+                        // added to the element. In such case, we have to overwrite it to prevent "switching it off"
+                        // by a browser (http://dev.ckeditor.com/ticket/14667).
+                        if ( CKEDITOR.env.ie && !CKEDITOR.env.edge ) {
+                                tmpElement = new CKEDITOR.dom.element( 'div' );
+                                while ( current = docFrag.getFirst() ) {
+                                        if ( current.$.style.backgroundColor ) {
+                                                // This is a necessary hack to make sure that IE will track backgroundColor CSS property, see
+                                                // http://dev.ckeditor.com/ticket/14667#comment:8 for more details.
+                                                current.$.style.backgroundColor = current.$.style.backgroundColor;
+                                        }
+                                        tmpElement.append( current );
+                                }
+                                // Re-insert the extracted piece after the element.
+                                tmpElement.insertAfter( this );
+                                tmpElement.remove( true );
+                        } else {
+                                // Re-insert the extracted piece after the element.
+                                docFrag.insertAfterNode( this );
+                        }
                },
                /**
@@ -429,7 +452,7 @@ CKEDITOR.dom.element.clearMarkers = function( database, element, removeFromDatab
                 */
                getHtml: function() {
                        var retval = this.$.innerHTML;
-                        // Strip <?xml:namespace> tags in IE. (#3341).
+                        // Strip <?xml:namespace> tags in IE. (http://dev.ckeditor.com/ticket/3341).
                        return CKEDITOR.env.ie ? retval.replace( /<\?[^>]*>/g, '' ) : retval;
                },
@@ -444,7 +467,7 @@ CKEDITOR.dom.element.clearMarkers = function( database, element, removeFromDatab
                getOuterHtml: function() {
                        if ( this.$.outerHTML ) {
                                // IE includes the <?xml:namespace> tag in the outerHTML of
-                                // namespaced element. So, we must strip it here. (#3341)
+                                // namespaced element. So, we must strip it here. (http://dev.ckeditor.com/ticket/3341)
                                return this.$.outerHTML.replace( /<\?[^>]*>/, '' );
                        }
@@ -595,7 +618,7 @@ CKEDITOR.dom.element.clearMarkers = function( database, element, removeFromDatab
                                                        return this.$[ name ];
                                                case 'style':
-                                                        // IE does not return inline styles via getAttribute(). See #2947.
+                                                        // IE does not return inline styles via getAttribute(). See http://dev.ckeditor.com/ticket/2947.
                                                        return this.$.style.cssText;
                                                case 'contenteditable':
@@ -611,6 +634,28 @@ CKEDITOR.dom.element.clearMarkers = function( database, element, removeFromDatab
                } )(),
                /**
+                 * Gets the values of all element attributes.
+                 *
+                 * @param {Array} exclude The names of attributes to be excluded from the returned object.
+                 * @return {Object} An object containing all element attributes with their values.
+                 */
+                getAttributes: function( exclude ) {
+                        var attributes = {},
+                                attrDefs = this.$.attributes,
+                                i;
+                        exclude = CKEDITOR.tools.isArray( exclude ) ? exclude : [];
+                        for ( i = 0; i < attrDefs.length; i++ ) {
+                                if ( CKEDITOR.tools.indexOf( exclude, attrDefs[ i ].name ) === -1 ) {
+                                        attributes[ attrDefs[ i ].name ] = attrDefs[ i ].value;
+                                }
+                        }
+                        return attributes;
+                },
+                /**
                 * Gets the nodes list containing all children of this element.
                 *
                 * @returns {CKEDITOR.dom.nodeList}
@@ -634,7 +679,7 @@ CKEDITOR.dom.element.clearMarkers = function( database, element, removeFromDatab
                                function( propertyName ) {
                                        var style = this.getWindow().$.getComputedStyle( this.$, null );
-                                        // Firefox may return null if we call the above on a hidden iframe. (#9117)
+                                        // Firefox may return null if we call the above on a hidden iframe. (http://dev.ckeditor.com/ticket/9117)
                                        return style ? style.getPropertyValue( propertyName ) : '';
                                } : function( propertyName ) {
                                        return this.$.currentStyle[ CKEDITOR.tools.cssStyleToDomStyle( propertyName ) ];
@@ -927,7 +972,7 @@ CKEDITOR.dom.element.clearMarkers = function( database, element, removeFromDatab
                                elementWindow, elementWindowFrame;
                        // Webkit and Opera report non-zero offsetHeight despite that
-                        // element is inside an invisible iframe. (#4542)
+                        // element is inside an invisible iframe. (http://dev.ckeditor.com/ticket/4542)
                        if ( isVisible && CKEDITOR.env.webkit ) {
                                elementWindow = this.getWindow();
@@ -988,7 +1033,7 @@ CKEDITOR.dom.element.clearMarkers = function( database, element, removeFromDatab
                                                        // attribute, which will be marked as "specified", even if the
                                                        // outerHTML of the element is not displaying the class attribute.
                                                        // Note : I was not able to reproduce it outside the editor,
-                                                        // but I've faced it while working on the TC of #1391.
+                                                        // but I've faced it while working on the TC of http://dev.ckeditor.com/ticket/1391.
                                                        if ( this.getAttribute( 'class' ) ) {
                                                                return true;
                                                        }
@@ -1012,7 +1057,7 @@ CKEDITOR.dom.element.clearMarkers = function( database, element, removeFromDatab
                                var attrs = this.$.attributes,
                                        attrsNum = attrs.length;
-                                // The _moz_dirty attribute might get into the element after pasting (#5455)
+                                // The _moz_dirty attribute might get into the element after pasting (http://dev.ckeditor.com/ticket/5455)
                                var execludeAttrs = { 'data-cke-expando': 1, _moz_dirty: 1 };
                                return attrsNum > 0 && ( attrsNum > 2 || !execludeAttrs[ attrs[ 0 ].nodeName ] || ( attrsNum == 2 && !execludeAttrs[ attrs[ 1 ].nodeName ] ) );
@@ -1119,7 +1164,7 @@ CKEDITOR.dom.element.clearMarkers = function( database, element, removeFromDatab
                        function mergeElements( element, sibling, isNext ) {
                                if ( sibling && sibling.type == CKEDITOR.NODE_ELEMENT ) {
                                        // Jumping over bookmark nodes and empty inline elements, e.g. <b><i></i></b>,
-                                        // queuing them to be moved later. (#5567)
+                                        // queuing them to be moved later. (http://dev.ckeditor.com/ticket/5567)
                                        var pendingNodes = [];
                                        while ( sibling.data( 'cke-bookmark' ) || sibling.isEmptyInlineRemoveable() ) {
@@ -1149,7 +1194,7 @@ CKEDITOR.dom.element.clearMarkers = function( database, element, removeFromDatab
                        }
                        return function( inlineOnly ) {
-                                // Merge empty links and anchors also. (#5567)
+                                // Merge empty links and anchors also. (http://dev.ckeditor.com/ticket/5567)
                                if ( !( inlineOnly === false || CKEDITOR.dtd.$removeEmpty[ this.getName() ] || this.is( 'a' ) ) ) {
                                        return;
                                }
@@ -1208,7 +1253,7 @@ CKEDITOR.dom.element.clearMarkers = function( database, element, removeFromDatab
                                };
                        } else if ( CKEDITOR.env.ie8Compat && CKEDITOR.env.secure ) {
                                return function( name, value ) {
-                                        // IE8 throws error when setting src attribute to non-ssl value. (#7847)
+                                        // IE8 throws error when setting src attribute to non-ssl value. (http://dev.ckeditor.com/ticket/7847)
                                        if ( name == 'src' && value.match( /^http:\/\// ) ) {
                                                try {
                                                        standard.apply( this, arguments );
@@ -1292,11 +1337,15 @@ CKEDITOR.dom.element.clearMarkers = function( database, element, removeFromDatab
                 */
                removeAttributes: function( attributes ) {
                        if ( CKEDITOR.tools.isArray( attributes ) ) {
-                                for ( var i = 0; i < attributes.length; i++ )
+                                for ( var i = 0; i < attributes.length; i++ ) {
                                        this.removeAttribute( attributes[ i ] );
+                                }
                        } else {
-                                for ( var attr in attributes )
+                                attributes = attributes || this.getAttributes();
+                                for ( var attr in attributes ) {
                                        attributes.hasOwnProperty( attr ) && this.removeAttribute( attr );
+                                }
                        }
                },
@@ -1442,7 +1491,8 @@ CKEDITOR.dom.element.clearMarkers = function( database, element, removeFromDatab
                                body = doc.getBody(),
                                quirks = doc.$.compatMode == 'BackCompat';
-                        if ( document.documentElement.getBoundingClientRect ) {
+                        if ( document.documentElement.getBoundingClientRect &&
+                                ( CKEDITOR.env.ie ? CKEDITOR.env.version !== 8 : true ) ) {
                                var box = this.$.getBoundingClientRect(),
                                        $doc = doc.$,
                                        $docElem = $doc.documentElement;
@@ -1451,7 +1501,7 @@ CKEDITOR.dom.element.clearMarkers = function( database, element, removeFromDatab
                                        clientLeft = $docElem.clientLeft || body.$.clientLeft || 0,
                                        needAdjustScrollAndBorders = true;
-                                // #3804: getBoundingClientRect() works differently on IE and non-IE
+                                // http://dev.ckeditor.com/ticket/3804: getBoundingClientRect() works differently on IE and non-IE
                                // browsers, regarding scroll positions.
                                //
                                // On IE, the top position of the <html> element is always 0, no matter
@@ -1466,12 +1516,12 @@ CKEDITOR.dom.element.clearMarkers = function( database, element, removeFromDatab
                                        needAdjustScrollAndBorders = ( quirks && inBody ) || ( !quirks && inDocElem );
                                }
-                                // #12747.
+                                // http://dev.ckeditor.com/ticket/12747.
                                if ( needAdjustScrollAndBorders ) {
                                        var scrollRelativeLeft,
                                                scrollRelativeTop;
-                                        // See #12758 to know more about document.(documentElement|body).scroll(Left|Top) in Webkit.
+                                        // See http://dev.ckeditor.com/ticket/12758 to know more about document.(documentElement|body).scroll(Left|Top) in Webkit.
                                        if ( CKEDITOR.env.webkit || ( CKEDITOR.env.ie && CKEDITOR.env.version >= 12 ) ) {
                                                scrollRelativeLeft = body.$.scrollLeft || $docElem.scrollLeft;
                                                scrollRelativeTop = body.$.scrollTop || $docElem.scrollTop;
@@ -1553,7 +1603,7 @@ CKEDITOR.dom.element.clearMarkers = function( database, element, removeFromDatab
                                        parent.$.clientHeight && parent.$.clientHeight < parent.$.scrollHeight;
                                // Skip body element, which will report wrong clientHeight when containing
-                                // floated content. (#9523)
+                                // floated content. (http://dev.ckeditor.com/ticket/9523)
                                if ( overflowed && !parent.is( 'body' ) )
                                        this.scrollIntoParent( parent, alignToTop, 1 );
@@ -1626,6 +1676,16 @@ CKEDITOR.dom.element.clearMarkers = function( database, element, removeFromDatab
                                return parseInt( element.getComputedStyle( 'margin-' + side ) || 0, 10 ) || 0;
                        }
+                        // [WebKit] Reset stored scrollTop value to not break scrollIntoView() method flow.
+                        // Scrolling breaks when range.select() is used right after element.scrollIntoView(). (http://dev.ckeditor.com/ticket/14659)
+                        if ( CKEDITOR.env.webkit ) {
+                                var editor = this.getEditor( false );
+                                if ( editor ) {
+                                        editor._.previousScrollTop = null;
+                                }
+                        }
                        var win = parent.getWindow();
                        var thisPos = screenPos( this, win ),
@@ -1797,7 +1857,7 @@ CKEDITOR.dom.element.clearMarkers = function( database, element, removeFromDatab
                        this.getParent( true ) && this.$.parentNode.replaceChild( newNode.$, this.$ );
                        newNode.$[ 'data-cke-expando' ] = this.$[ 'data-cke-expando' ];
                        this.$ = newNode.$;
-                        // Bust getName's cache. (#8663)
+                        // Bust getName's cache. (http://dev.ckeditor.com/ticket/8663)
                        delete this.getName;
                },
@@ -1905,17 +1965,32 @@ CKEDITOR.dom.element.clearMarkers = function( database, element, removeFromDatab
                 *              CKEDITOR.replace( element );
                 *              alert( element.getEditor().name ); // 'editor1'
                 *
+                 * By default this method considers only original DOM elements upon which the editor
+                 * was created. Setting `optimized` parameter to `false` will consider editor editable
+                 * and its children.
+                 *
+                 * @param {Boolean} [optimized=true] If set to `false` it will scan every editor editable.
                 * @returns {CKEDITOR.editor} An editor instance or null if nothing has been found.
                 */
-                getEditor: function() {
+                getEditor: function( optimized ) {
                        var instances = CKEDITOR.instances,
-                                name, instance;
+                                name, instance, editable;
+                        optimized = optimized || optimized === undefined;
                        for ( name in instances ) {
                                instance = instances[ name ];
                                if ( instance.element.equals( this ) && instance.elementMode != CKEDITOR.ELEMENT_MODE_APPENDTO )
                                        return instance;
+                                if ( !optimized ) {
+                                        editable = instance.editable();
+                                        if ( editable && ( editable.equals( this ) || editable.contains( this ) ) ) {
+                                                return instance;
+                                        }
+                                }
                        }
                        return null;
@@ -2038,7 +2113,8 @@ CKEDITOR.dom.element.clearMarkers = function( database, element, removeFromDatab
        }
        function getContextualizedSelector( element, selector ) {
-                return '#' + element.$.id + ' ' + selector.split( /,\s*/ ).join( ', #' + element.$.id + ' ' );
+                var id = CKEDITOR.tools.escapeCss( element.$.id );
+                return '#' + id + ' ' + selector.split( /,\s*/ ).join( ', #' + id + ' ' );
        }
        var sides = {
@@ -2070,7 +2146,7 @@ CKEDITOR.dom.element.clearMarkers = function( database, element, removeFromDatab
        function marginAndPaddingSize( type ) {
                var adjustment = 0;
                for ( var i = 0, len = sides[ type ].length; i < len; i++ )
-                        adjustment += parseInt( this.getComputedStyle( sides[ type ][ i ] ) || 0, 10 ) || 0;
+                        adjustment += parseFloat( this.getComputedStyle( sides[ type ][ i ] ) || 0, 10 ) || 0;
                return adjustment;
        }
diff --git a/sources/core/dom/elementpath.js b/sources/core/dom/elementpath.js
index 1ee551b..dd50f10 100644
--- a/sources/core/dom/elementpath.js
+++ b/sources/core/dom/elementpath.js
@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 * For licensing, see LICENSE.md or http://ckeditor.com/license
 */
@@ -57,6 +57,11 @@
                // Backward compact.
                root = root || startNode.getDocument().getBody();
+                // Assign root value if startNode is null (#424)(https://dev.ckeditor.com/ticket/17028).
+                if ( !e ) {
+                        e = root;
+                }
                do {
                        if ( e.type == CKEDITOR.NODE_ELEMENT ) {
                                elements.push( e );
@@ -84,7 +89,7 @@
                                                block = e;
                                        if ( pathBlockLimitElements[ elementName ] ) {
-                                                // End level DIV is considered as the block, if no block is available. (#525)
+                                                // End level DIV is considered as the block, if no block is available. (http://dev.ckeditor.com/ticket/525)
                                                // But it must NOT be the root element (checked above).
                                                if ( !block && elementName == 'div' && !checkHasBlock( e ) )
                                                        block = e;
@@ -181,7 +186,9 @@ CKEDITOR.dom.elementPath.prototype = {
         * @returns {CKEDITOR.dom.element} The first matched dom element or `null`.
         */
        contains: function( query, excludeRoot, fromTop ) {
-                var evaluator;
+                var i = 0,
+                        evaluator;
                if ( typeof query == 'string' )
                        evaluator = function( node ) {
                                return node.getName() == query;
@@ -203,14 +210,21 @@ CKEDITOR.dom.elementPath.prototype = {
                var elements = this.elements,
                        length = elements.length;
-                excludeRoot && length--;
+                if ( excludeRoot ) {
+                        if ( !fromTop ) {
+                                length -= 1;
+                        } else {
+                                i += 1;
+                        }
+                }
                if ( fromTop ) {
                        elements = Array.prototype.slice.call( elements, 0 );
                        elements.reverse();
                }
-                for ( var i = 0; i < length; i++ ) {
+                for ( ; i < length; i++ ) {
                        if ( evaluator( elements[ i ] ) )
                                return elements[ i ];
                }
diff --git a/sources/core/dom/event.js b/sources/core/dom/event.js
index 7cc1bd8..8b1193a 100644
--- a/sources/core/dom/event.js
+++ b/sources/core/dom/event.js
@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 * For licensing, see LICENSE.md or http://ckeditor.com/license
 */
diff --git a/sources/core/dom/iterator.js b/sources/core/dom/iterator.js
index 1e1b180..9176e33 100644
--- a/sources/core/dom/iterator.js
+++ b/sources/core/dom/iterator.js
@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 * For licensing, see LICENSE.md or http://ckeditor.com/license
 */
@@ -45,7 +45,7 @@
                 */
                this.forceBrBreak = 0;
-                // (#3730).
+                // (http://dev.ckeditor.com/ticket/3730).
                /**
                 * Whether to include `<br>` elements in the enlarged range. Should be
                 * set to `false` when using the iterator in the {@link CKEDITOR#ENTER_BR} mode.
@@ -85,7 +85,7 @@
         */
        var beginWhitespaceRegex = /^[\r\n\t ]+$/,
-                // Ignore bookmark nodes.(#3783)
+                // Ignore bookmark nodes.(http://dev.ckeditor.com/ticket/3783)
                bookmarkGuard = CKEDITOR.dom.walker.bookmark( false, true ),
                whitespacesGuard = CKEDITOR.dom.walker.whitespaces( true ),
                skipGuard = function( node ) {
@@ -191,12 +191,12 @@
                                                }
                                                // The range must finish right before the boundary,
-                                                // including possibly skipped empty spaces. (#1603)
+                                                // including possibly skipped empty spaces. (http://dev.ckeditor.com/ticket/1603)
                                                if ( range ) {
                                                        range.setEndAt( currentNode, CKEDITOR.POSITION_BEFORE_START );
                                                        // The found boundary must be set as the next one at this
-                                                        // point. (#1717)
+                                                        // point. (http://dev.ckeditor.com/ticket/1717)
                                                        if ( nodeName != 'br' ) {
                                                                this._.nextNode = currentNode;
                                                        }
@@ -244,7 +244,7 @@
                                                        closeRange = 1;
                                                        includeNode = 0;
                                                        isLast = isLast || ( parentNode.equals( lastNode ) );
-                                                        // Make sure range includes bookmarks at the end of the block. (#7359)
+                                                        // Make sure range includes bookmarks at the end of the block. (http://dev.ckeditor.com/ticket/7359)
                                                        range.setEndAt( parentNode, CKEDITOR.POSITION_BEFORE_END );
                                                        break;
                                                }
@@ -377,7 +377,7 @@
                        // Here we are checking in guard function whether current element
                        // reach lastNode(default behaviour) and root node to prevent against
                        // getting out of editor instance root DOM object.
-                        // #12484
+                        // http://dev.ckeditor.com/ticket/12484
                        function guardFunction( node ) {
                                return !( node.equals( lastNode ) || node.equals( rootNode ) );
                        }
@@ -397,7 +397,7 @@
                        // Indicate at least one of the range boundaries is inside a preformat block.
                        touchPre,
-                        // (#12178)
+                        // (http://dev.ckeditor.com/ticket/12178)
                        // Remember if following situation takes place:
                        // * startAtInnerBoundary: <p>foo[</p>...
                        // * endAtInnerBoundary: ...<p>]bar</p>
@@ -405,13 +405,13 @@
                        // Note that we test only if path block exist, because we must properly shrink
                        // range containing table and/or table cells.
                        // Note: When range is collapsed there's no way it can be shrinked.
-                        // By checking if range is collapsed we also prevent #12308.
+                        // By checking if range is collapsed we also prevent http://dev.ckeditor.com/ticket/12308.
                        startPath = range.startPath(),
                        endPath = range.endPath(),
                        startAtInnerBoundary = !range.collapsed && rangeAtInnerBlockBoundary( range, startPath.block ),
                        endAtInnerBoundary = !range.collapsed && rangeAtInnerBlockBoundary( range, endPath.block, 1 );
-                // Shrink the range to exclude harmful "noises" (#4087, #4450, #5435).
+                // Shrink the range to exclude harmful "noises" (http://dev.ckeditor.com/ticket/4087, http://dev.ckeditor.com/ticket/4450, http://dev.ckeditor.com/ticket/5435).
                range.shrink( CKEDITOR.SHRINK_ELEMENT, true );
                if ( startAtInnerBoundary )
@@ -437,7 +437,7 @@
                        // We may have an empty text node at the end of block due to [3770].
                        // If that node is the lastNode, it would cause our logic to leak to the
-                        // next block.(#3887)
+                        // next block.(http://dev.ckeditor.com/ticket/3887)
                        if ( this._.lastNode && this._.lastNode.type == CKEDITOR.NODE_TEXT && !CKEDITOR.tools.trim( this._.lastNode.getText() ) && this._.lastNode.getParent().isBlockBoundary() ) {
                                var testRange = this.range.clone();
                                testRange.moveToPosition( this._.lastNode, CKEDITOR.POSITION_AFTER_END );
diff --git a/sources/core/dom/node.js b/sources/core/dom/node.js
index 7818b07..69b223e 100644
--- a/sources/core/dom/node.js
+++ b/sources/core/dom/node.js
@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 * For licensing, see LICENSE.md or http://ckeditor.com/license
 */
@@ -200,7 +200,7 @@ CKEDITOR.tools.extend( CKEDITOR.dom.node.prototype, {
                }
                // IE8 rename HTML5 nodes by adding `:` at the begging of the tag name when the node is cloned,
-                // so `<figure>` will be `<:figure>` after 'cloneNode'. We need to fix it (#13101).
+                // so `<figure>` will be `<:figure>` after 'cloneNode'. We need to fix it (http://dev.ckeditor.com/ticket/13101).
                function renameNodes( node ) {
                        if ( node.type != CKEDITOR.NODE_ELEMENT && node.type != CKEDITOR.NODE_DOCUMENT_FRAGMENT )
                                return;
@@ -804,7 +804,7 @@ CKEDITOR.tools.extend( CKEDITOR.dom.node.prototype, {
                                } else if ( trimmed.length < originalLength ) {
                                        child.split( originalLength - trimmed.length );
-                                        // IE BUG: child.remove() may raise JavaScript errors here. (#81)
+                                        // IE BUG: child.remove() may raise JavaScript errors here. (http://dev.ckeditor.com/ticket/81)
                                        this.$.removeChild( this.$.firstChild );
                                }
                        }
@@ -829,7 +829,7 @@ CKEDITOR.tools.extend( CKEDITOR.dom.node.prototype, {
                                        child.split( trimmed.length );
                                        // IE BUG: child.getNext().remove() may raise JavaScript errors here.
-                                        // (#81)
+                                        // (http://dev.ckeditor.com/ticket/81)
                                        this.$.lastChild.parentNode.removeChild( this.$.lastChild );
                                }
                        }
@@ -840,7 +840,7 @@ CKEDITOR.tools.extend( CKEDITOR.dom.node.prototype, {
                        child = this.$.lastChild;
                        if ( child && child.type == 1 && child.nodeName.toLowerCase() == 'br' ) {
-                                // Use "eChildNode.parentNode" instead of "node" to avoid IE bug (#324).
+                                // Use "eChildNode.parentNode" instead of "node" to avoid IE bug (http://dev.ckeditor.com/ticket/324).
                                child.parentNode.removeChild( child );
                        }
                }
@@ -874,7 +874,7 @@ CKEDITOR.tools.extend( CKEDITOR.dom.node.prototype, {
                if ( this.type != CKEDITOR.NODE_ELEMENT )
                        element = this.getParent();
-                // Prevent Edge crash (#13609, #13919).
+                // Prevent Edge crash (http://dev.ckeditor.com/ticket/13609, http://dev.ckeditor.com/ticket/13919).
                if ( CKEDITOR.env.edge && element && element.is( 'textarea', 'input' ) ) {
                        checkOnlyAttributes = true;
                }
diff --git a/sources/core/dom/nodelist.js b/sources/core/dom/nodelist.js
index 0f91eaa..07af314 100644
--- a/sources/core/dom/nodelist.js
+++ b/sources/core/dom/nodelist.js
@@ -1,11 +1,11 @@
 /**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 * For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 /**
 * Represents a list of {@link CKEDITOR.dom.node} objects.
- * It's a wrapper for native nodes list.
+ * It is a wrapper for a native nodes list.
 *
 *              var nodeList = CKEDITOR.document.getBody().getChildren();
 *              alert( nodeList.count() ); // number [0;N]
@@ -20,7 +20,7 @@ CKEDITOR.dom.nodeList = function( nativeList ) {
 CKEDITOR.dom.nodeList.prototype = {
        /**
-         * Get count of nodes in this list.
+         * Gets the count of nodes in this list.
         *
         * @returns {Number}
         */
@@ -29,7 +29,7 @@ CKEDITOR.dom.nodeList.prototype = {
        },
        /**
-         * Get node from the list.
+         * Gets the node from the list.
         *
         * @returns {CKEDITOR.dom.node}
         */
@@ -39,5 +39,16 @@ CKEDITOR.dom.nodeList.prototype = {
                var $node = this.$[ index ];
                return $node ? new CKEDITOR.dom.node( $node ) : null;
+        },
+        /**
+         * Returns a node list as an array.
+         *
+         * @returns {CKEDITOR.dom.node[]}
+         */
+        toArray: function() {
+                return CKEDITOR.tools.array.map( this.$, function( nativeEl ) {
+                        return new CKEDITOR.dom.node( nativeEl );
+                } );
        }
 };
diff --git a/sources/core/dom/range.js b/sources/core/dom/range.js
index b5e8736..742c24c 100644
--- a/sources/core/dom/range.js
+++ b/sources/core/dom/range.js
@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 * For licensing, see LICENSE.md or http://ckeditor.com/license
 */
@@ -204,9 +204,14 @@ CKEDITOR.dom.range = function( root ) {
                // This allows us to not think about startNode == endNode case later on.
                // We do that only when cloning, because in other cases we can safely split this text node
                // and hence we can easily handle this case as many others.
-                if ( isClone && endNode.type == CKEDITOR.NODE_TEXT && startNode.equals( endNode ) ) {
-                        startNode = range.document.createText( startNode.substring( startOffset, endOffset ) );
+                // We need to handle situation when selection startNode is type of NODE_ELEMENT (#426).
-                        docFrag.append( startNode );
+                if ( isClone &&
+                        endNode.type == CKEDITOR.NODE_TEXT &&
+                        ( startNode.equals( endNode ) || ( startNode.type === CKEDITOR.NODE_ELEMENT && startNode.getFirst().equals( endNode ) ) ) ) {
+                        // Here we should always be inside one text node.
+                        docFrag.append( range.document.createText( endNode.substring( startOffset, endOffset ) ) );
                        return;
                }
@@ -214,7 +219,7 @@ CKEDITOR.dom.range = function( root ) {
                // second part. The removal will be handled by the rest of the code.
                if ( endNode.type == CKEDITOR.NODE_TEXT ) {
                        // If Extract or Delete we can split the text node,
-                        // but if Clone (2), then we cannot modify the DOM (#11586) so we mark the text node for cloning.
+                        // but if Clone (2), then we cannot modify the DOM (http://dev.ckeditor.com/ticket/11586) so we mark the text node for cloning.
                        if ( !isClone ) {
                                endNode = endNode.split( endOffset );
                        } else {
@@ -243,7 +248,7 @@ CKEDITOR.dom.range = function( root ) {
                // be handled by the rest of the code .
                if ( startNode.type == CKEDITOR.NODE_TEXT ) {
                        // If Extract or Delete we can split the text node,
-                        // but if Clone (2), then we cannot modify the DOM (#11586) so we mark
+                        // but if Clone (2), then we cannot modify the DOM (http://dev.ckeditor.com/ticket/11586) so we mark
                        // the text node for cloning.
                        if ( !isClone ) {
                                startNode.split( startOffset );
@@ -373,7 +378,7 @@ CKEDITOR.dom.range = function( root ) {
                                // If we don't do that, in next iterations nodes will be appended to wrong parent.
                                //
                                // We can just take first child because the algorithm guarantees
-                                // that this will be the only child on this level. (#13568)
+                                // that this will be the only child on this level. (http://dev.ckeditor.com/ticket/13568)
                                levelParent = levelParent.getChild( 0 );
                        }
                }
@@ -405,7 +410,7 @@ CKEDITOR.dom.range = function( root ) {
                                // When Extracting, move the removed node to the docFrag.
                                if ( isExtract ) {
-                                        newParent.append( node );
+                                        newParent.append( node, toStart );
                                }
                        }
@@ -574,7 +579,7 @@ CKEDITOR.dom.range = function( root ) {
                        // Tolerant bogus br when checking at the end of block.
                        // Reject any text node unless it's being bookmark
                        // OR it's spaces.
-                        // Reject any element unless it's being invisible empty. (#3883)
+                        // Reject any element unless it's being invisible empty. (http://dev.ckeditor.com/ticket/3883)
                        return !checkStart && isBogus( node ) ||
                                node.type == CKEDITOR.NODE_ELEMENT &&
                                node.is( CKEDITOR.dtd.$removeEmpty );
@@ -1052,7 +1057,7 @@ CKEDITOR.dom.range = function( root ) {
                        }
                        // Sometimes the endNode will come right before startNode for collapsed
-                        // ranges. Fix it. (#3780)
+                        // ranges. Fix it. (http://dev.ckeditor.com/ticket/3780)
                        if ( startNode.getPosition( endNode ) & CKEDITOR.POSITION_FOLLOWING )
                                startNode = endNode;
@@ -1201,7 +1206,8 @@ CKEDITOR.dom.range = function( root ) {
                /**
                 * Expands the range so that partial units are completely contained.
                 *
-                 * @param unit {Number} The unit type to expand with.
+                 * @param {Number} unit The unit type to expand with. Use one of following values: {@link CKEDITOR#ENLARGE_BLOCK_CONTENTS},
+                 * {@link CKEDITOR#ENLARGE_ELEMENT}, {@link CKEDITOR#ENLARGE_INLINE}, {@link CKEDITOR#ENLARGE_LIST_ITEM_CONTENTS}.
                 * @param {Boolean} [excludeBrs=false] Whether include line-breaks when expanding.
                 */
                enlarge: function( unit, excludeBrs ) {
@@ -1323,13 +1329,13 @@ CKEDITOR.dom.range = function( root ) {
                                                                isWhiteSpace = /[\s\ufeff]$/.test( siblingText );
                                                        } else {
-                                                                // #12221 (Chrome) plus #11111 (Safari).
+                                                                // http://dev.ckeditor.com/ticket/12221 (Chrome) plus http://dev.ckeditor.com/ticket/11111 (Safari).
                                                                var offsetWidth0 = CKEDITOR.env.webkit ? 1 : 0;
                                                                // If this is a visible element.
                                                                // We need to check for the bookmark attribute because IE insists on
-                                                                // rendering the display:none nodes we use for bookmarks. (#3363)
+                                                                // rendering the display:none nodes we use for bookmarks. (http://dev.ckeditor.com/ticket/3363)
-                                                                // Line-breaks (br) are rendered with zero width, which we don't want to include. (#7041)
+                                                                // Line-breaks (br) are rendered with zero width, which we don't want to include. (http://dev.ckeditor.com/ticket/7041)
                                                                if ( ( sibling.$.offsetWidth > offsetWidth0 || excludeBrs && sibling.is( 'br' ) ) && !sibling.data( 'cke-bookmark' ) ) {
                                                                        // We'll accept it only if we need
                                                                        // whitespace, and this is an inline
@@ -1398,7 +1404,7 @@ CKEDITOR.dom.range = function( root ) {
                                        // Process the end boundary. This is basically the same
                                        // code used for the start boundary, with small changes to
-                                        // make it work in the oposite side (to the right). This
+                                        // make it work in the opposite side (to the right). This
                                        // makes it difficult to reuse the code here. So, fixes to
                                        // the above code are likely to be replicated here.
@@ -1481,7 +1487,7 @@ CKEDITOR.dom.range = function( root ) {
                                                        }
                                                }
                                        } else {
-                                                // Get the node right after the boudary to be checked
+                                                // Get the node right after the boundary to be checked
                                                // first.
                                                sibling = container.getChild( offset );
@@ -1524,8 +1530,8 @@ CKEDITOR.dom.range = function( root ) {
                                                        } else if ( sibling.type == CKEDITOR.NODE_ELEMENT ) {
                                                                // If this is a visible element.
                                                                // We need to check for the bookmark attribute because IE insists on
-                                                                // rendering the display:none nodes we use for bookmarks. (#3363)
+                                                                // rendering the display:none nodes we use for bookmarks. (http://dev.ckeditor.com/ticket/3363)
-                                                                // Line-breaks (br) are rendered with zero width, which we don't want to include. (#7041)
+                                                                // Line-breaks (br) are rendered with zero width, which we don't want to include. (http://dev.ckeditor.com/ticket/7041)
                                                                if ( ( sibling.$.offsetWidth > 0 || excludeBrs && sibling.is( 'br' ) ) && !sibling.data( 'cke-bookmark' ) ) {
                                                                        // We'll accept it only if we need
                                                                        // whitespace, and this is an inline
@@ -1616,7 +1622,7 @@ CKEDITOR.dom.range = function( root ) {
                                                boundaryGuard = function( node ) {
                                                        // We should not check contents of non-editable elements. It may happen
                                                        // that inline widget has display:table child which should not block range#enlarge.
-                                                        // When encoutered non-editable element...
+                                                        // When encountered non-editable element...
                                                        if ( node.type == CKEDITOR.NODE_ELEMENT && node.getAttribute( 'contenteditable' ) == 'false' ) {
                                                                if ( inNonEditable ) {
                                                                        // ... in which we already were, reset it (because we're leaving it) and return.
@@ -1638,7 +1644,7 @@ CKEDITOR.dom.range = function( root ) {
                                                                blockBoundary = node;
                                                        return retval;
                                                },
-                                                // Record the encounted 'tailBr' for later use.
+                                                // Record the encountered 'tailBr' for later use.
                                                tailBrGuard = function( node ) {
                                                        var retval = boundaryGuard( node );
                                                        if ( !retval && node.is && node.is( 'br' ) )
@@ -1659,7 +1665,7 @@ CKEDITOR.dom.range = function( root ) {
                                        this.setStartAt( blockBoundary, !blockBoundary.is( 'br' ) && ( !enlargeable && this.checkStartOfBlock() ||
                                                enlargeable && blockBoundary.contains( enlargeable ) ) ? CKEDITOR.POSITION_AFTER_START : CKEDITOR.POSITION_AFTER_END );
-                                        // Avoid enlarging the range further when end boundary spans right after the BR. (#7490)
+                                        // Avoid enlarging the range further when end boundary spans right after the BR. (http://dev.ckeditor.com/ticket/7490)
                                        if ( unit == CKEDITOR.ENLARGE_LIST_ITEM_CONTENTS ) {
                                                var theRange = this.clone();
                                                walker = new CKEDITOR.dom.walker( theRange );
@@ -1714,18 +1720,28 @@ CKEDITOR.dom.range = function( root ) {
                },
                /**
-                 * Descrease the range to make sure that boundaries
+                 * Decreases the range to make sure that boundaries
-                 * always anchor beside text nodes or innermost element.
+                 * always anchor beside text nodes or the innermost element.
                 *
                 * @param {Number} mode The shrinking mode ({@link CKEDITOR#SHRINK_ELEMENT} or {@link CKEDITOR#SHRINK_TEXT}).
                 *
-                 * * {@link CKEDITOR#SHRINK_ELEMENT} - Shrink the range boundaries to the edge of the innermost element.
+                 * * {@link CKEDITOR#SHRINK_ELEMENT} &ndash; Shrinks the range boundaries to the edge of the innermost element.
-                 * * {@link CKEDITOR#SHRINK_TEXT} - Shrink the range boudaries to anchor by the side of enclosed text
+                 * * {@link CKEDITOR#SHRINK_TEXT} &ndash; Shrinks the range boundaries to anchor by the side of enclosed text
-                 *     node, range remains if there's no text nodes on boundaries at all.
+                 *     node. The range remains if there are no text nodes available on boundaries.
-                 *
+                 *
-                 * @param {Boolean} selectContents Whether result range anchors at the inner OR outer boundary of the node.
+                 * @param {Boolean} [selectContents=false] Whether the resulting range anchors at the inner OR outer boundary of the node.
+                 * @param {Boolean/Object} [options=true] If this parameter is of a Boolean type, it is treated as
+                 * `options.shrinkOnBlockBoundary`. This parameter was added in 4.7.0.
+                 * @param {Boolean} [options.shrinkOnBlockBoundary=true] Whether the block boundary should be included in
+                 * the shrunk range.
+                 * @param {Boolean} [options.skipBogus=false] Whether bogus `<br>` elements should be ignored while
+                 * `mode` is set to {@link CKEDITOR#SHRINK_TEXT}. This option was added in 4.7.0.
                 */
-                shrink: function( mode, selectContents, shrinkOnBlockBoundary ) {
+                shrink: function( mode, selectContents, options ) {
+                        var shrinkOnBlockBoundary = typeof options === 'boolean' ? options :
+                                ( options && typeof options.shrinkOnBlockBoundary === 'boolean' ? options.shrinkOnBlockBoundary : true ),
+                                skipBogus = options && options.skipBogus;
                        // Unable to shrink a collapsed range.
                        if ( !this.collapsed ) {
                                mode = mode || CKEDITOR.SHRINK_TEXT;
@@ -1748,7 +1764,7 @@ CKEDITOR.dom.range = function( root ) {
                                                walkerRange.setStartAfter( startContainer );
                                        else {
                                                // Enlarge the range properly to avoid walker making
-                                                // DOM changes caused by triming the text nodes later.
+                                                // DOM changes caused by trimming the text nodes later.
                                                walkerRange.setStartBefore( startContainer );
                                                moveStart = 0;
                                        }
@@ -1766,7 +1782,8 @@ CKEDITOR.dom.range = function( root ) {
                                }
                                var walker = new CKEDITOR.dom.walker( walkerRange ),
-                                        isBookmark = CKEDITOR.dom.walker.bookmark();
+                                        isBookmark = CKEDITOR.dom.walker.bookmark(),
+                                        isBogus = CKEDITOR.dom.walker.bogus();
                                walker.evaluator = function( node ) {
                                        return node.type == ( mode == CKEDITOR.SHRINK_ELEMENT ? CKEDITOR.NODE_ELEMENT : CKEDITOR.NODE_TEXT );
@@ -1774,6 +1791,11 @@ CKEDITOR.dom.range = function( root ) {
                                var currentElement;
                                walker.guard = function( node, movingOut ) {
+                                        // Skipping bogus before other cases (http://dev.ckeditor.com/ticket/17010).
+                                        if ( skipBogus && isBogus( node ) ) {
+                                                return true;
+                                        }
                                        if ( isBookmark( node ) )
                                                return true;
@@ -1815,7 +1837,7 @@ CKEDITOR.dom.range = function( root ) {
                /**
                 * Inserts a node at the start of the range. The range will be expanded
-                 * the contain the node.
+                 * to contain the node.
                 *
                 * @param {CKEDITOR.dom.node} node
                 */
@@ -1842,7 +1864,7 @@ CKEDITOR.dom.range = function( root ) {
                },
                /**
-                 * Moves the range to given position according to specified node.
+                 * Moves the range to a given position according to the specified node.
                 *
                 *              // HTML: <p>Foo <b>bar</b></p>
                 *              range.moveToPosition( elB, CKEDITOR.POSITION_BEFORE_START );
@@ -1850,7 +1872,7 @@ CKEDITOR.dom.range = function( root ) {
                 *
                 * See also {@link #setStartAt} and {@link #setEndAt}.
                 *
-                 * @param {CKEDITOR.dom.node} node The node according to which position will be set.
+                 * @param {CKEDITOR.dom.node} node The node according to which the position will be set.
                 * @param {Number} position One of {@link CKEDITOR#POSITION_BEFORE_START},
                 * {@link CKEDITOR#POSITION_AFTER_START}, {@link CKEDITOR#POSITION_BEFORE_END},
                 * {@link CKEDITOR#POSITION_AFTER_END}.
@@ -2117,7 +2139,7 @@ CKEDITOR.dom.range = function( root ) {
                        // So even if the initial range was placed before the bogus <br>, after creating the bookmark it
                        // is placed before the bookmark.
                        // Fortunately, getBogus() is able to skip the bookmark so it finds the bogus <br> in this case.
-                        // We remove incorrectly placed one and add a brand new one. (#13001)
+                        // We remove incorrectly placed one and add a brand new one. (http://dev.ckeditor.com/ticket/13001)
                        var bogus = fixedBlock.getBogus();
                        if ( bogus ) {
                                bogus.remove();
@@ -2339,7 +2361,7 @@ CKEDITOR.dom.range = function( root ) {
                                        this.trim( 0, 1 );
                        }
-                        // Antecipate the trim() call here, so the walker will not make
+                        // Anticipate the trim() call here, so the walker will not make
                        // changes to the DOM, which would not get reflected into this
                        // range otherwise.
                        this.trim();
@@ -2378,7 +2400,7 @@ CKEDITOR.dom.range = function( root ) {
                                        this.trim( 1, 0 );
                        }
-                        // Antecipate the trim() call here, so the walker will not make
+                        // Anticipate the trim() call here, so the walker will not make
                        // changes to the DOM, which would not get reflected into this
                        // range otherwise.
                        this.trim();
@@ -2635,7 +2657,7 @@ CKEDITOR.dom.range = function( root ) {
                getEnclosedNode: function() {
                        var walkerRange = this.clone();
-                        // Optimize and analyze the range to avoid DOM destructive nature of walker. (#5780)
+                        // Optimize and analyze the range to avoid DOM destructive nature of walker. (http://dev.ckeditor.com/ticket/5780)
                        walkerRange.optimize();
                        if ( walkerRange.startContainer.type != CKEDITOR.NODE_ELEMENT || walkerRange.endContainer.type != CKEDITOR.NODE_ELEMENT )
                                return null;
@@ -2702,6 +2724,53 @@ CKEDITOR.dom.range = function( root ) {
                getPreviousEditableNode: getNextEditableNode( 1 ),
                /**
+                 * Returns any table element, like `td`, `tbody`, `table` etc. from a given range. The element
+                 * is returned only if the range is contained within one table (might be a nested
+                 * table, but it cannot be two different tables on the same DOM level).
+                 *
+                 * @private
+                 * @since 4.7
+                 * @param {Object} [tableElements] Mapping of element names that should be considered.
+                 * @returns {CKEDITOR.dom.element/null}
+                 */
+                _getTableElement: function( tableElements ) {
+                        tableElements = tableElements || {
+                                td: 1,
+                                th: 1,
+                                tr: 1,
+                                tbody: 1,
+                                thead: 1,
+                                tfoot: 1,
+                                table: 1
+                        };
+                        var start = this.startContainer,
+                                end = this.endContainer,
+                                startTable = start.getAscendant( 'table', true ),
+                                endTable = end.getAscendant( 'table', true );
+                        // Super weird edge case in Safari: if there is a table with only one cell inside and that cell
+                        // is selected, then the end boundary of the table is moved into editor's editable.
+                        // That case is also present when selecting the last cell inside nested table.
+                        if ( CKEDITOR.env.safari && startTable && end.equals( this.root ) ) {
+                                return start.getAscendant( tableElements, true );
+                        }
+                        if ( this.getEnclosedNode() ) {
+                                return this.getEnclosedNode().getAscendant( tableElements, true );
+                        }
+                        // Ensure that selection starts and ends in the same table or one of the table is inside the other.
+                        if ( startTable && endTable && ( startTable.equals( endTable ) || startTable.contains( endTable ) ||
+                                endTable.contains( startTable ) ) ) {
+                                return start.getAscendant( tableElements, true );
+                        }
+                        return null;
+                },
+                /**
                 * Scrolls the start of current range into view.
                 */
                scrollIntoView: function() {
@@ -2783,9 +2852,112 @@ CKEDITOR.dom.range = function( root ) {
                        }
                        // %REMOVE_END%
                        this.endContainer = endContainer;
+                },
+                /**
+                 * Looks for elements matching the `query` selector within a range.
+                 *
+                 * @since 4.5.11
+                 * @private
+                 * @param {String} query
+                 * @param {Boolean} [includeNonEditables=false] Whether elements with `contenteditable` set to `false` should
+                 * be included.
+                 * @returns {CKEDITOR.dom.element[]}
+                 */
+                _find: function( query, includeNonEditables ) {
+                        var ancestor = this.getCommonAncestor(),
+                                boundaries = this.getBoundaryNodes(),
+                                // Contrary to CKEDITOR.dom.element#find we're returning array, that's because NodeList is immutable, and we need
+                                // to do some filtering in returned list.
+                                ret = [],
+                                curItem,
+                                i,
+                                initialMatches,
+                                isStartGood,
+                                isEndGood;
+                        if ( ancestor && ancestor.find ) {
+                                initialMatches = ancestor.find( query );
+                                for ( i = 0; i < initialMatches.count(); i++ ) {
+                                        curItem = initialMatches.getItem( i );
+                                        // Using isReadOnly() method to filterout non editables. It checks isContentEditable including all browser quirks.
+                                        if ( !includeNonEditables && curItem.isReadOnly() ) {
+                                                continue;
+                                        }
+                                        // It's not enough to get elements from common ancestor, because it might contain too many matches.
+                                        // We need to ensure that returned items are between boundary points.
+                                        isStartGood = ( curItem.getPosition( boundaries.startNode ) & CKEDITOR.POSITION_FOLLOWING ) || boundaries.startNode.equals( curItem );
+                                        isEndGood = ( curItem.getPosition( boundaries.endNode ) & ( CKEDITOR.POSITION_PRECEDING + CKEDITOR.POSITION_IS_CONTAINED ) ) || boundaries.endNode.equals( curItem );
+                                        if ( isStartGood && isEndGood ) {
+                                                ret.push( curItem );
+                                        }
+                                }
+                        }
+                        return ret;
                }
        };
+        /**
+         * Merges every subsequent range in given set, returning a smaller array of ranges.
+         *
+         * Note that each range in the returned value will be enlarged with `CKEDITOR.ENLARGE_ELEMENT` value.
+         *
+         * @since 4.7.0
+         * @static
+         * @param {CKEDITOR.dom.range[]} ranges
+         * @returns {CKEDITOR.dom.range[]} Set of merged ranges.
+         * @member CKEDITOR.dom.range
+         */
+        CKEDITOR.dom.range.mergeRanges = function( ranges ) {
+                return CKEDITOR.tools.array.reduce( ranges, function( ret, rng ) {
+                        // Last range ATM.
+                        var lastRange = ret[ ret.length - 1 ],
+                                isContinuation = false;
+                        // Make a clone, we don't want to modify input.
+                        rng = rng.clone();
+                        rng.enlarge( CKEDITOR.ENLARGE_ELEMENT );
+                        if ( lastRange ) {
+                                // The trick is to create a range spanning the gap between the two ranges. Then iterate over
+                                // each node found in this gap. If it contains anything other than whitespace, then it means it
+                                // is not a continuation.
+                                var gapRange = new CKEDITOR.dom.range( rng.root ),
+                                        walker = new CKEDITOR.dom.walker( gapRange ),
+                                        isWhitespace = CKEDITOR.dom.walker.whitespaces(),
+                                        nodeInBetween;
+                                gapRange.setStart( lastRange.endContainer, lastRange.endOffset );
+                                gapRange.setEnd( rng.startContainer, rng.startOffset );
+                                nodeInBetween = walker.next();
+                                while ( isWhitespace( nodeInBetween ) || rng.endContainer.equals( nodeInBetween ) ) {
+                                        // We don't care about whitespaces, and range container. Also we skip the endContainer,
+                                        // as it will also be provided by the iterator (as it visits it's opening tag).
+                                        nodeInBetween = walker.next();
+                                }
+                                // Simply, if anything has been found there's a content in between the two.
+                                isContinuation = !nodeInBetween;
+                        }
+                        if ( isContinuation ) {
+                                // If last range ends, where the current range starts, then let's merge it.
+                                lastRange.setEnd( rng.endContainer, rng.endOffset );
+                        } else {
+                                // In other case just push cur range into the stack.
+                                ret.push( rng );
+                        }
+                        return ret;
+                }, [] );
+        };
 } )();
@@ -2861,9 +3033,32 @@ CKEDITOR.POSITION_BEFORE_START = 3;
 */
 CKEDITOR.POSITION_AFTER_END = 4;
+/**
+ * @readonly
+ * @member CKEDITOR
+ * @property {Number} [=1]
+ */
 CKEDITOR.ENLARGE_ELEMENT = 1;
+/**
+ * @readonly
+ * @member CKEDITOR
+ * @property {Number} [=2]
+ */
 CKEDITOR.ENLARGE_BLOCK_CONTENTS = 2;
+/**
+ * @readonly
+ * @member CKEDITOR
+ * @property {Number} [=3]
+ */
 CKEDITOR.ENLARGE_LIST_ITEM_CONTENTS = 3;
+/**
+ * @readonly
+ * @member CKEDITOR
+ * @property {Number} [=4]
+ */
 CKEDITOR.ENLARGE_INLINE = 4;
 // Check boundary types.
diff --git a/sources/core/dom/rangelist.js b/sources/core/dom/rangelist.js
index d02fc03..15ccb88 100644
--- a/sources/core/dom/rangelist.js
+++ b/sources/core/dom/rangelist.js
@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 * For licensing, see LICENSE.md or http://ckeditor.com/license
 */
@@ -164,7 +164,7 @@
        };
        // Update the specified range which has been mangled by previous insertion of
-        // range bookmark nodes.(#3256)
+        // range bookmark nodes.(http://dev.ckeditor.com/ticket/3256)
        function updateDirtyRange( bookmark, dirtyRange, checkEnd ) {
                var serializable = bookmark.serializable,
                        container = dirtyRange[ checkEnd ? 'endContainer' : 'startContainer' ],
diff --git a/sources/core/dom/text.js b/sources/core/dom/text.js
index c313259..e77a3d9 100644
--- a/sources/core/dom/text.js
+++ b/sources/core/dom/text.js
@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 * For licensing, see LICENSE.md or http://ckeditor.com/license
 */
@@ -106,7 +106,7 @@ CKEDITOR.tools.extend( CKEDITOR.dom.text.prototype, {
                                retval.insertAfter( this );
                        } else {
                                // IE BUG: IE8+ does not update the childNodes array in DOM after splitText(),
-                                // we need to make some DOM changes to make it update. (#3436)
+                                // we need to make some DOM changes to make it update. (http://dev.ckeditor.com/ticket/3436)
                                var workaround = doc.createText( '' );
                                workaround.insertAfter( retval );
                                workaround.remove();
diff --git a/sources/core/dom/walker.js b/sources/core/dom/walker.js
index 746b406..8665909 100644
--- a/sources/core/dom/walker.js
+++ b/sources/core/dom/walker.js
@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 * For licensing, see LICENSE.md or http://ckeditor.com/license
 */
@@ -319,7 +319,7 @@
         */
        CKEDITOR.dom.element.prototype.isBlockBoundary = function( customNodeNames ) {
                // Whether element is in normal page flow. Floated or positioned elements are out of page flow.
-                // Don't consider floated or positioned formatting as block boundary, fall back to dtd check in that case. (#6297)
+                // Don't consider floated or positioned formatting as block boundary, fall back to dtd check in that case. (http://dev.ckeditor.com/ticket/6297)
                var inPageFlow = this.getComputedStyle( 'float' ) == 'none' && !( this.getComputedStyle( 'position' ) in outOfFlowPositions );
                if ( inPageFlow && blockBoundaryDisplayMatch[ this.getComputedStyle( 'display' ) ] )
@@ -388,7 +388,7 @@
                return function( node ) {
                        var isWhitespace;
                        if ( node && node.type == CKEDITOR.NODE_TEXT ) {
-                                // Whitespace, as well as the Filling Char Sequence text node used in Webkit. (#9384, #13816)
+                                // Whitespace, as well as the Filling Char Sequence text node used in Webkit. (http://dev.ckeditor.com/ticket/9384, http://dev.ckeditor.com/ticket/13816)
                                isWhitespace = !CKEDITOR.tools.trim( node.getText() ) ||
                                        CKEDITOR.env.webkit && node.getText() == CKEDITOR.dom.selection.FILLING_CHAR_SEQUENCE;
                        }
@@ -406,7 +406,7 @@
         */
        CKEDITOR.dom.walker.invisible = function( isReject ) {
                var whitespace = CKEDITOR.dom.walker.whitespaces(),
-                        // #12221 (Chrome) plus #11111 (Safari).
+                        // http://dev.ckeditor.com/ticket/12221 (Chrome) plus http://dev.ckeditor.com/ticket/11111 (Safari).
                        offsetWidth0 = CKEDITOR.env.webkit ? 1 : 0;
                return function( node ) {
@@ -422,7 +422,7 @@
                                // Nodes that take no spaces in wysiwyg:
                                // 1. White-spaces but not including NBSP.
                                // 2. Empty inline elements, e.g. <b></b>.
-                                // 3. <br> elements (bogus, surrounded by text) (#12423).
+                                // 3. <br> elements (bogus, surrounded by text) (http://dev.ckeditor.com/ticket/12423).
                                invisible = node.$.offsetWidth <= offsetWidth0;
                        }
@@ -636,7 +636,7 @@
         * @returns {CKEDITOR.dom.node/Boolean} Bogus node or `false`.
         */
        CKEDITOR.dom.element.prototype.getBogus = function() {
-                // Bogus are not always at the end, e.g. <p><a>text<br /></a></p> (#7070).
+                // Bogus are not always at the end, e.g. <p><a>text<br /></a></p> (http://dev.ckeditor.com/ticket/7070).
                var tail = this;
                do {
                        tail = tail.getPreviousSourceNode();
diff --git a/sources/core/dom/window.js b/sources/core/dom/window.js
index edfeb84..ceeaeff 100644
--- a/sources/core/dom/window.js
+++ b/sources/core/dom/window.js
@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 * For licensing, see LICENSE.md or http://ckeditor.com/license
 */
diff --git a/sources/core/dtd.js b/sources/core/dtd.js
index d6dc5a6..6059d48 100644
--- a/sources/core/dtd.js
+++ b/sources/core/dtd.js
@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 * For licensing, see LICENSE.md or http://ckeditor.com/license
 */
diff --git a/sources/core/editable.js b/sources/core/editable.js
index b9b0270..6b3fa9f 100644
--- a/sources/core/editable.js
+++ b/sources/core/editable.js
@@ -1,9 +1,12 @@
 /**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 * For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 ( function() {
+        var isNotWhitespace, isNotBookmark, isEmpty, isBogus, emptyParagraphRegexp,
+                insert, fixTableAfterContentsDeletion, fixListAfterContentsDelete, getHtmlFromRangeHelpers, extractHtmlFromRangeHelpers;
        /**
         * Editable class which provides all editing related activities by
         * the `contenteditable` element, dynamically get attached to editor instance.
@@ -71,17 +74,36 @@
                                        }
                                }
-                                // [IE] Use instead "setActive" method to focus the editable if it belongs to
+                                // [Edge] Starting from EdgeHTML 14.14393, it does not support `setActive`. We need to use focus which
-                                // the host page document, to avoid bringing an unexpected scroll.
+                                // causes unexpected scroll. Store scrollTop value so it can be restored after focusing editor.
+                                // Scroll only happens if the editor is focused for the first time. (http://dev.ckeditor.com/ticket/14825)
+                                if ( CKEDITOR.env.edge && CKEDITOR.env.version > 14 && !this.hasFocus && this.getDocument().equals( CKEDITOR.document ) ) {
+                                        this.editor._.previousScrollTop = this.$.scrollTop;
+                                }
+                                // [IE] Use instead "setActive" method to focus the editable if it belongs to the host page document,
+                                // to avoid bringing an unexpected scroll.
                                try {
-                                        this.$[ CKEDITOR.env.ie && this.getDocument().equals( CKEDITOR.document ) ? 'setActive' : 'focus' ]();
+                                        if ( CKEDITOR.env.ie && !( CKEDITOR.env.edge && CKEDITOR.env.version > 14 ) && this.getDocument().equals( CKEDITOR.document ) ) {
+                                                this.$.setActive();
+                                        } else {
+                                                // We have no control over exactly what happens when the native `focus` method is called,
+                                                // so save the scroll position and restore it later.
+                                                if ( CKEDITOR.env.chrome ) {
+                                                        var scrollPos = this.$.scrollTop;
+                                                        this.$.focus();
+                                                        this.$.scrollTop = scrollPos;
+                                                } else {
+                                                        this.$.focus();
+                                                }
+                                        }
                                } catch ( e ) {
                                        // IE throws unspecified error when focusing editable after closing dialog opened on nested editable.
                                        if ( !CKEDITOR.env.ie )
                                                throw e;
                                }
-                                // Remedy if Safari doens't applies focus properly. (#279)
+                                // Remedy if Safari doens't applies focus properly. (http://dev.ckeditor.com/ticket/279)
                                if ( CKEDITOR.env.safari && !this.isInline() ) {
                                        active = CKEDITOR.document.getActive();
                                        if ( !active.equals( this.getWindow().getFrame() ) )
@@ -103,7 +125,7 @@
                                        // The "focusin/focusout" events bubbled, e.g. If there are elements with layout
                                        // they fire this event when clicking in to edit them but it must be ignored
-                                        // to allow edit their contents. (#4682)
+                                        // to allow edit their contents. (http://dev.ckeditor.com/ticket/4682)
                                        fn = isNotBubbling( fn, this );
                                        args[ 0 ] = name;
                                        args[ 1 ] = fn;
@@ -238,7 +260,7 @@
                         * @param {String} text
                         */
                        insertText: function( text ) {
-                                // Focus the editor before calling transformPlainTextToHtml. (#12726)
+                                // Focus the editor before calling transformPlainTextToHtml. (http://dev.ckeditor.com/ticket/12726)
                                this.editor.focus();
                                this.insertHtml( this.transformPlainTextToHtml( text ), 'text' );
                        },
@@ -336,7 +358,7 @@
                        insertElement: function( element, range ) {
                                var editor = this.editor;
-                                // Prepare for the insertion. For example - focus editor (#11848).
+                                // Prepare for the insertion. For example - focus editor (http://dev.ckeditor.com/ticket/11848).
                                editor.focus();
                                editor.fire( 'saveSnapshot' );
@@ -349,12 +371,12 @@
                                        range = selection.getRanges()[ 0 ];
                                }
-                                // Insert element into first range only and ignore the rest (#11183).
+                                // Insert element into first range only and ignore the rest (http://dev.ckeditor.com/ticket/11183).
                                if ( this.insertElementIntoRange( element, range ) ) {
                                        range.moveToPosition( element, CKEDITOR.POSITION_AFTER_END );
                                        // If we're inserting a block element, the new cursor position must be
-                                        // optimized. (#3100,#5436,#8950)
+                                        // optimized. (http://dev.ckeditor.com/ticket/3100,http://dev.ckeditor.com/ticket/5436,http://dev.ckeditor.com/ticket/8950)
                                        if ( isBlock ) {
                                                // Find next, meaningful element.
                                                var next = element.getNext( function( node ) {
@@ -415,12 +437,19 @@
                                // Remove the original contents, merge split nodes.
                                range.deleteContents( 1 );
-                                // If range is placed in inermediate element (not td or th), we need to do three things:
+                                if ( range.startContainer.type == CKEDITOR.NODE_ELEMENT ) {
-                                // * fill emptied <td/th>s with if browser needs them,
+                                        // If range is placed in intermediate element (not td or th), we need to do three things:
-                                // * remove empty text nodes so IE8 won't crash (http://dev.ckeditor.com/ticket/11183#comment:8),
+                                        // * fill emptied <td/th>s with if browser needs them,
-                                // * fix structure and move range into the <td/th> element.
+                                        // * remove empty text nodes so IE8 won't crash
-                                if ( range.startContainer.type == CKEDITOR.NODE_ELEMENT && range.startContainer.is( { tr: 1, table: 1, tbody: 1, thead: 1, tfoot: 1 } ) )
+                                        // (http://dev.ckeditor.com/ticket/11183#comment:8),
-                                        fixTableAfterContentsDeletion( range );
+                                        // * fix structure and move range into the <td/th> element.
+                                        if ( range.startContainer.is( { tr: 1, table: 1, tbody: 1, thead: 1, tfoot: 1 } ) ) {
+                                                fixTableAfterContentsDeletion( range );
+                                        } else if ( range.startContainer.is( CKEDITOR.dtd.$list ) ) {
+                                                // Similarly there's a need for lists.
+                                                fixListAfterContentsDelete( range );
+                                        }
+                                }
                                // If we're inserting a block at dtd-violated position, split
                                // the parent blocks until we reach blockLimit.
@@ -435,7 +464,7 @@
                                                        range.splitElement( current );
                                                // If we're in an empty block which indicate a new paragraph,
-                                                // simply replace it with the inserting block.(#3664)
+                                                // simply replace it with the inserting block.(http://dev.ckeditor.com/ticket/3664)
                                                else if ( range.checkStartOfBlock() && range.checkEndOfBlock() ) {
                                                        range.setStartBefore( current );
                                                        range.collapse( true );
@@ -749,7 +778,7 @@
                                                range.checkEndOfBlock() &&
                                                path.block &&
                                                !range.root.equals( path.block ) &&
-                                                // Do not remove a block with bookmarks. (#13465)
+                                                // Do not remove a block with bookmarks. (http://dev.ckeditor.com/ticket/13465)
                                                !hasBookmarks( path.block ) ) {
                                                range.moveToPosition( path.block, CKEDITOR.POSITION_BEFORE_START );
                                                path.block.remove();
@@ -811,7 +840,7 @@
                                        // IE considers control-type element as separate
                                        // focus host when selected, avoid destroying the
-                                        // selection in such case. (#5812) (#8949)
+                                        // selection in such case. (http://dev.ckeditor.com/ticket/5812) (http://dev.ckeditor.com/ticket/8949)
                                        if ( ieSel && ieSel.type == 'Control' )
                                                return;
@@ -862,6 +891,30 @@
                                        this.hasFocus = true;
                                }, null, null, -1 );
+                                if ( CKEDITOR.env.webkit ) {
+                                        // [WebKit] Save scrollTop value so it can be used when restoring locked selection. (http://dev.ckeditor.com/ticket/14659)
+                                        this.on( 'scroll', function() {
+                                                editor._.previousScrollTop = editor.editable().$.scrollTop;
+                                        }, null, null, -1 );
+                                }
+                                // [Edge] This is the other part of the workaround for Edge which restores saved
+                                // scrollTop value and removes listener which is not needed anymore. (http://dev.ckeditor.com/ticket/14825)
+                                if ( CKEDITOR.env.edge && CKEDITOR.env.version > 14 ) {
+                                        var fixScrollOnFocus = function() {
+                                                var editable = editor.editable();
+                                                if ( editor._.previousScrollTop != null && editable.getDocument().equals( CKEDITOR.document ) ) {
+                                                        editable.$.scrollTop = editor._.previousScrollTop;
+                                                        editor._.previousScrollTop = null;
+                                                        this.removeListener( 'scroll', fixScrollOnFocus );
+                                                }
+                                        };
+                                        this.on( 'scroll', fixScrollOnFocus );
+                                }
                                // Register to focus manager.
                                editor.focusManager.add( this );
@@ -902,12 +955,16 @@
                                // Create the content stylesheet for this document.
                                var styles = CKEDITOR.getCss();
                                if ( styles ) {
-                                        var head = doc.getHead();
+                                        var head = doc.getHead(),
-                                        if ( !head.getCustomData( 'stylesheet' ) ) {
+                                                stylesElement = head.getCustomData( 'stylesheet' );
+                                        if ( !stylesElement ) {
                                                var sheet = doc.appendStyleText( styles );
                                                sheet = new CKEDITOR.dom.element( sheet.ownerNode || sheet.owningElement );
                                                head.setCustomData( 'stylesheet', sheet );
                                                sheet.data( 'cke-temp', 1 );
+                                        } else if ( styles != stylesElement.getText() ) {
+                                                CKEDITOR.env.ie && CKEDITOR.env.version < 9 ? stylesElement.$.styleSheet.cssText = styles : stylesElement.setText( styles );
                                        }
                                }
@@ -918,7 +975,7 @@
                                // Pass this configuration to styles system.
                                this.setCustomData( 'cke_includeReadonly', !editor.config.disableReadonlyStyling );
-                                // Prevent the browser opening read-only links. (#6032 & #10912)
+                                // Prevent the browser opening read-only links. (http://dev.ckeditor.com/ticket/6032 & http://dev.ckeditor.com/ticket/10912)
                                this.attachListener( this, 'click', function( evt ) {
                                        evt = evt.data;
@@ -931,7 +988,7 @@
                                var backspaceOrDelete = { 8: 1, 46: 1 };
                                // Override keystrokes which should have deletion behavior
-                                //  on fully selected element . (#4047) (#7645)
+                                //  on fully selected element . (http://dev.ckeditor.com/ticket/4047) (http://dev.ckeditor.com/ticket/7645)
                                this.attachListener( editor, 'key', function( evt ) {
                                        if ( editor.readOnly )
                                                return true;
@@ -941,10 +998,15 @@
                                        var keyCode = evt.data.domEvent.getKey(),
                                                isHandled;
+                                        // Prevent of reading path of empty range (http://dev.ckeditor.com/ticket/13096, #457).
+                                        var sel = editor.getSelection();
+                                        if ( sel.getRanges().length === 0 ) {
+                                                return;
+                                        }
                                        // Backspace OR Delete.
                                        if ( keyCode in backspaceOrDelete ) {
-                                                var sel = editor.getSelection(),
+                                                var selected,
-                                                        selected,
                                                        range = sel.getRanges()[ 0 ],
                                                        path = range.startPath(),
                                                        block,
@@ -952,16 +1014,17 @@
                                                        next,
                                                        rtl = keyCode == 8;
                                                if (
-                                                                // [IE<11] Remove selected image/anchor/etc here to avoid going back in history. (#10055)
+                                                                // [IE<11] Remove selected image/anchor/etc here to avoid going back in history. (http://dev.ckeditor.com/ticket/10055)
                                                                ( CKEDITOR.env.ie && CKEDITOR.env.version < 11 && ( selected = sel.getSelectedElement() ) ) ||
-                                                                // Remove the entire list/table on fully selected content. (#7645)
+                                                                // Remove the entire list/table on fully selected content. (http://dev.ckeditor.com/ticket/7645)
                                                                ( selected = getSelectedTableList( sel ) ) ) {
                                                        // Make undo snapshot.
                                                        editor.fire( 'saveSnapshot' );
                                                        // Delete any element that 'hasLayout' (e.g. hr,table) in IE8 will
-                                                        // break up the selection, safely manage it here. (#4795)
+                                                        // break up the selection, safely manage it here. (http://dev.ckeditor.com/ticket/4795)
                                                        range.moveToPosition( selected, CKEDITOR.POSITION_BEFORE_START );
                                                        // Remove the control manually.
                                                        selected.remove();
@@ -971,7 +1034,7 @@
                                                        isHandled = 1;
                                                } else if ( range.collapsed ) {
-                                                        // Handle the following special cases: (#6217)
+                                                        // Handle the following special cases: (http://dev.ckeditor.com/ticket/6217)
                                                        // 1. Del/Backspace key before/after table;
                                                        // 2. Backspace Key after start of table.
                                                        if ( ( block = path.block ) &&
@@ -1046,28 +1109,28 @@
                                        editor.fire( 'doubleclick', data );
                                } );
-                                // Prevent automatic submission in IE #6336
+                                // Prevent automatic submission in IE http://dev.ckeditor.com/ticket/6336
                                CKEDITOR.env.ie && this.attachListener( this, 'click', blockInputClick );
-                                // Gecko/Webkit need some help when selecting control type elements. (#3448)
+                                // Gecko/Webkit need some help when selecting control type elements. (http://dev.ckeditor.com/ticket/3448)
-                                // We apply same behavior for IE Edge. (#13386)
+                                // We apply same behavior for IE Edge. (http://dev.ckeditor.com/ticket/13386)
                                if ( !CKEDITOR.env.ie || CKEDITOR.env.edge ) {
                                        this.attachListener( this, 'mousedown', function( ev ) {
                                                var control = ev.data.getTarget();
-                                                // #11727. Note: htmlDP assures that input/textarea/select have contenteditable=false
+                                                // http://dev.ckeditor.com/ticket/11727. Note: htmlDP assures that input/textarea/select have contenteditable=false
                                                // attributes. However, they also have data-cke-editable attribute, so isReadOnly() returns false,
                                                // and therefore those elements are correctly selected by this code.
                                                if ( control.is( 'img', 'hr', 'input', 'textarea', 'select' ) && !control.isReadOnly() ) {
                                                        editor.getSelection().selectElement( control );
-                                                        // Prevent focus from stealing from the editable. (#9515)
+                                                        // Prevent focus from stealing from the editable. (http://dev.ckeditor.com/ticket/9515)
                                                        if ( control.is( 'input', 'textarea', 'select' ) )
                                                                ev.data.preventDefault();
                                                }
                                        } );
                                }
-                                // For some reason, after click event is done, IE Edge loses focus on the selected element. (#13386)
+                                // For some reason, after click event is done, IE Edge loses focus on the selected element. (http://dev.ckeditor.com/ticket/13386)
                                if ( CKEDITOR.env.edge ) {
                                        this.attachListener( this, 'mouseup', function( ev ) {
                                                var selectedElement = ev.data.getTarget();
@@ -1078,7 +1141,7 @@
                                }
                                // Prevent right click from selecting an empty block even
-                                // when selection is anchored inside it. (#5845)
+                                // when selection is anchored inside it. (http://dev.ckeditor.com/ticket/5845)
                                if ( CKEDITOR.env.gecko ) {
                                        this.attachListener( this, 'mouseup', function( ev ) {
                                                if ( ev.data.$.button == 2 ) {
@@ -1109,7 +1172,7 @@
                                }
                                // Prevent Webkit/Blink from going rogue when joining
-                                // blocks on BACKSPACE/DEL (#11861,#9998).
+                                // blocks on BACKSPACE/DEL (http://dev.ckeditor.com/ticket/11861,http://dev.ckeditor.com/ticket/9998).
                                if ( CKEDITOR.env.webkit ) {
                                        this.attachListener( editor, 'key', function( evt ) {
                                                if ( editor.readOnly ) {
@@ -1123,8 +1186,14 @@
                                                if ( !( key in backspaceOrDelete ) )
                                                        return;
+                                                // Prevent of reading path of empty range (http://dev.ckeditor.com/ticket/13096, #457).
+                                                var sel = editor.getSelection();
+                                                if ( sel.getRanges().length === 0 ) {
+                                                        return;
+                                                }
                                                var backspace = key == 8,
-                                                        range = editor.getSelection().getRanges()[ 0 ],
+                                                        range = sel.getRanges()[ 0 ],
                                                        startPath = range.startPath();
                                                if ( range.collapsed ) {
@@ -1135,7 +1204,7 @@
                                                                return;
                                                }
-                                                // Scroll to the new position of the caret (#11960).
+                                                // Scroll to the new position of the caret (http://dev.ckeditor.com/ticket/11960).
                                                editor.getSelection().scrollIntoView();
                                                editor.fire( 'saveSnapshot' );
@@ -1190,8 +1259,9 @@
         *
         * @method editable
         * @member CKEDITOR.editor
-         * @param {CKEDITOR.dom.element/CKEDITOR.editable} elementOrEditable The
+         * @param {CKEDITOR.dom.element/CKEDITOR.editable} [elementOrEditable] The
         * DOM element to become the editable or a {@link CKEDITOR.editable} object.
+         * @returns {CKEDITOR.dom.element/null} The editor's editable element, or `null` if not available.
         */
        CKEDITOR.editor.prototype.editable = function( element ) {
                var editable = this._.editable;
@@ -1214,7 +1284,7 @@
        CKEDITOR.on( 'instanceLoaded', function( evt ) {
                var editor = evt.editor;
-                // and flag that the element was locked by our code so it'll be editable by the editor functions (#6046).
+                // and flag that the element was locked by our code so it'll be editable by the editor functions (http://dev.ckeditor.com/ticket/6046).
                editor.on( 'insertElement', function( evt ) {
                        var element = evt.data;
                        if ( element.type == CKEDITOR.NODE_ELEMENT && ( element.is( 'input' ) || element.is( 'textarea' ) ) ) {
@@ -1229,9 +1299,9 @@
                        if ( editor.readOnly )
                                return;
-                        // Auto fixing on some document structure weakness to enhance usabilities. (#3190 and #3189)
+                        // Auto fixing on some document structure weakness to enhance usabilities. (http://dev.ckeditor.com/ticket/3190 and http://dev.ckeditor.com/ticket/3189)
                        var sel = editor.getSelection();
-                        // Do it only when selection is not locked. (#8222)
+                        // Do it only when selection is not locked. (http://dev.ckeditor.com/ticket/8222)
                        if ( sel && !sel.isLocked ) {
                                var isDirty = editor.checkDirty();
@@ -1281,7 +1351,7 @@
                } );
        } );
-        // #9222: Show text cursor in Gecko.
+        // http://dev.ckeditor.com/ticket/9222: Show text cursor in Gecko.
        // Show default cursor over control elements on all non-IEs.
        CKEDITOR.addCss( '.cke_editable{cursor:text}.cke_editable img,.cke_editable input,.cke_editable textarea{cursor:default}' );
@@ -1291,15 +1361,15 @@
        //
        //
-        var isNotWhitespace = CKEDITOR.dom.walker.whitespaces( true ),
+        isNotWhitespace = CKEDITOR.dom.walker.whitespaces( true ),
-                isNotBookmark = CKEDITOR.dom.walker.bookmark( false, true ),
+        isNotBookmark = CKEDITOR.dom.walker.bookmark( false, true ),
-                isEmpty = CKEDITOR.dom.walker.empty(),
+        isEmpty = CKEDITOR.dom.walker.empty(),
-                isBogus = CKEDITOR.dom.walker.bogus(),
+        isBogus = CKEDITOR.dom.walker.bogus(),
-                // Matching an empty paragraph at the end of document.
+        // Matching an empty paragraph at the end of document.
-                emptyParagraphRegexp = /(^|<body\b[^>]*>)\s*<(p|div|address|h\d|center|pre)[^>]*>\s*(?:<br[^>]*>|&nbsp;|\u00A0|&#160;)?\s*(:?<\/\2>)?\s*(?=$|<\/body>)/gi;
+        emptyParagraphRegexp = /(^|<body\b[^>]*>)\s*<(p|div|address|h\d|center|pre)[^>]*>\s*(?:<br[^>]*>|&nbsp;|\u00A0|&#160;)?\s*(:?<\/\2>)?\s*(?=$|<\/body>)/gi;
-        // Auto-fixing block-less content by wrapping paragraph (#3190), prevent
+        // Auto-fixing block-less content by wrapping paragraph (http://dev.ckeditor.com/ticket/3190), prevent
-        // non-exitable-block by padding extra br.(#3189)
+        // non-exitable-block by padding extra br.(http://dev.ckeditor.com/ticket/3189)
        // Returns truly value when dom was changed, falsy otherwise.
        function fixDom( evt ) {
                var editor = evt.editor,
@@ -1320,7 +1390,7 @@
                }
                // When we're in block enter mode, a new paragraph will be established
-                // to encapsulate inline contents inside editable. (#3657)
+                // to encapsulate inline contents inside editable. (http://dev.ckeditor.com/ticket/3657)
                // Don't autoparagraph if browser (namely - IE) incorrectly anchored selection
                // inside non-editable content. This happens e.g. if non-editable block is the only
                // content of editable.
@@ -1348,7 +1418,7 @@
                                selectionUpdateNeeded = 1;
-                                // Cancel this selection change in favor of the next (correct). (#6811)
+                                // Cancel this selection change in favor of the next (correct). (http://dev.ckeditor.com/ticket/6811)
                                evt.cancel();
                        }
                }
@@ -1364,13 +1434,13 @@
                if ( selection.isFake )
                        return 0;
-                // Ensure bogus br could help to move cursor (out of styles) to the end of block. (#7041)
+                // Ensure bogus br could help to move cursor (out of styles) to the end of block. (http://dev.ckeditor.com/ticket/7041)
                var pathBlock = path.block || path.blockLimit,
                        lastNode = pathBlock && pathBlock.getLast( isNotEmpty );
                // Check some specialities of the current path block:
-                // 1. It is really displayed as block; (#7221)
+                // 1. It is really displayed as block; (http://dev.ckeditor.com/ticket/7221)
-                // 2. It doesn't end with one inner block; (#7467)
+                // 2. It doesn't end with one inner block; (http://dev.ckeditor.com/ticket/7467)
                // 3. It doesn't have bogus br yet.
                if (
                        pathBlock && pathBlock.isBlockBoundary() &&
@@ -1507,7 +1577,7 @@
        // Whether in given context (pathBlock, pathBlockLimit and editor settings)
        // editor should automatically wrap inline contents with blocks.
        function shouldAutoParagraph( editor, pathBlock, pathBlockLimit ) {
-                // Check whether pathBlock equals pathBlockLimit to support nested editable (#12162).
+                // Check whether pathBlock equals pathBlockLimit to support nested editable (http://dev.ckeditor.com/ticket/12162).
                return editor.config.autoParagraph !== false &&
                        editor.activeEnterMode != CKEDITOR.ENTER_BR &&
                        (
@@ -1523,7 +1593,7 @@
        //
        // Functions related to insertXXX methods
        //
-        var insert = ( function() {
+        insert = ( function() {
                'use strict';
                var DTD = CKEDITOR.dtd;
@@ -1574,7 +1644,7 @@
                        // Select range and stop execution.
                        // If data has been totally emptied after the filtering,
-                        // any insertion is pointless (#10339).
+                        // any insertion is pointless (http://dev.ckeditor.com/ticket/10339).
                        if ( data && processDataForInsertion( that, data ) ) {
                                // DATA INSERTION
                                insertDataIntoRange( that );
@@ -1959,7 +2029,7 @@
                                        nodeName = node.getName();
                                        // Extract only the list items, when insertion happens
-                                        // inside of a list, reads as rearrange list items. (#7957)
+                                        // inside of a list, reads as rearrange list items. (http://dev.ckeditor.com/ticket/7957)
                                        if ( insideOfList && nodeName in CKEDITOR.dtd.$list ) {
                                                nodesData = nodesData.concat( extractNodesData( node, that ) );
                                                continue;
@@ -2207,7 +2277,7 @@
                        }
                        // Don't use String.replace because it fails in IE7 if special replacement
-                        // characters ($$, $&, etc.) are in data (#10367).
+                        // characters ($$, $&, etc.) are in data (http://dev.ckeditor.com/ticket/10367).
                        return wrapper.getOuterHtml().split( '{cke-peak}' ).join( data );
                }
@@ -2232,7 +2302,7 @@
        // 1. Fixes a range which is a result of deleteContents() and is placed in an intermediate element (see dtd.$intermediate),
        // inside a table. A goal is to find a closest <td> or <th> element and when this fails, recreate the structure of the table.
        // 2. Fixes empty cells by appending bogus <br>s or deleting empty text nodes in IE<=8 case.
-        var fixTableAfterContentsDeletion = ( function() {
+        fixTableAfterContentsDeletion = ( function() {
                // Creates an element walker which can only "go deeper". It won't
                // move out from any element. Therefore it can be used to find <td>x</td> in cases like:
                // <table><tbody><tr><td>x</td></tr></tbody>^<tfoot>...
@@ -2330,6 +2400,65 @@
                };
        } )();
+        fixListAfterContentsDelete = ( function() {
+                // Creates an element walker which operates only within lists.
+                function getFixListSelectionWalker( testRange ) {
+                        var walker = new CKEDITOR.dom.walker( testRange );
+                        walker.guard = function( node, isMovingOut ) {
+                                if ( isMovingOut )
+                                        return false;
+                                if ( node.type == CKEDITOR.NODE_ELEMENT )
+                                        return node.is( CKEDITOR.dtd.$list ) || node.is( CKEDITOR.dtd.$listItem );
+                        };
+                        walker.evaluator = function( node ) {
+                                return node.type == CKEDITOR.NODE_ELEMENT && node.is( CKEDITOR.dtd.$listItem );
+                        };
+                        return walker;
+                }
+                return function( range ) {
+                        var container = range.startContainer,
+                                appendToStart = false,
+                                testRange,
+                                deeperSibling;
+                        // Look left.
+                        testRange = range.clone();
+                        testRange.setStart( container, 0 );
+                        deeperSibling = getFixListSelectionWalker( testRange ).lastBackward();
+                        // If left is empty, look right.
+                        if ( !deeperSibling ) {
+                                testRange = range.clone();
+                                testRange.setEndAt( container, CKEDITOR.POSITION_BEFORE_END );
+                                deeperSibling = getFixListSelectionWalker( testRange ).lastForward();
+                                appendToStart = true;
+                        }
+                        // If there's no deeper nested element in both direction - container is empty - we'll use it then.
+                        if ( !deeperSibling )
+                                deeperSibling = container;
+                        // We found a list what means that it's empty - remove it completely.
+                        if ( deeperSibling.is( CKEDITOR.dtd.$list ) ) {
+                                range.setStartAt( deeperSibling, CKEDITOR.POSITION_BEFORE_START );
+                                range.collapse( true );
+                                deeperSibling.remove();
+                                return;
+                        }
+                        // To avoid setting selection after bogus, remove it from the target list item.
+                        // We can safely do that, because we'll insert element into that cell.
+                        var bogus = deeperSibling.getBogus();
+                        if ( bogus )
+                                bogus.remove();
+                        range.moveToPosition( deeperSibling, appendToStart ? CKEDITOR.POSITION_AFTER_START : CKEDITOR.POSITION_BEFORE_END );
+                        range.select();
+                };
+        } )();
        function mergeBlocksCollapsedSelection( editor, range, backspace, startPath ) {
                var startBlock = startPath.block;
@@ -2409,7 +2538,7 @@
                if ( ( bogus = startBlock.getBogus() ) )
                        bogus.remove();
-                // Changing end container to element from text node (#12503).
+                // Changing end container to element from text node (http://dev.ckeditor.com/ticket/12503).
                range.enlarge( CKEDITOR.ENLARGE_INLINE );
                // Delete range contents. Do NOT merge. Merging is weird.
@@ -2432,7 +2561,7 @@
                range = editor.getSelection().getRanges()[ 0 ];
                range.collapse( 1 );
-                // Optimizing range containers from text nodes to elements (#12503).
+                // Optimizing range containers from text nodes to elements (http://dev.ckeditor.com/ticket/12503).
                range.optimize();
                if ( range.startContainer.getHtml() === '' ) {
                        range.startContainer.appendBogus();
@@ -2473,7 +2602,7 @@
        //
        // Helpers for editable.getHtmlFromRange.
        //
-        var getHtmlFromRangeHelpers = {
+        getHtmlFromRangeHelpers = {
                eol: {
                        detect: function( that, editable ) {
                                var range = that.range,
@@ -2638,7 +2767,7 @@
        //
        // Helpers for editable.extractHtmlFromRange.
        //
-        var extractHtmlFromRangeHelpers = ( function() {
+        extractHtmlFromRangeHelpers = ( function() {
                function optimizeBookmarkNode( node, toStart ) {
                        var parent = node.getParent();
@@ -2654,7 +2783,7 @@
                        while ( ( next = endBookmark.getNext() ) ) {
                                next.insertAfter( startBookmark );
-                                // Update startBookmark after insertion to avoid the reversal of nodes (#13449).
+                                // Update startBookmark after insertion to avoid the reversal of nodes (http://dev.ckeditor.com/ticket/13449).
                                startBookmark = next;
                        }
@@ -2805,7 +2934,7 @@
                                walker.guard = function( node, leaving ) {
                                        // Guard may be executed on some node boundaries multiple times,
-                                        // what results in creating more than one range for each selected cell. (#12964)
+                                        // what results in creating more than one range for each selected cell. (http://dev.ckeditor.com/ticket/12964)
                                        if ( node.type == CKEDITOR.NODE_ELEMENT ) {
                                                var key = 'visited_' + ( leaving ? 'out' : 'in' );
                                                if ( node.getCustomData( key ) ) {
diff --git a/sources/core/editor.js b/sources/core/editor.js
index 31188d2..640cec0 100644
--- a/sources/core/editor.js
+++ b/sources/core/editor.js
@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 * For licensing, see LICENSE.md or http://ckeditor.com/license
 */
@@ -29,7 +29,7 @@
                // Call the CKEDITOR.event constructor to initialize this instance.
                CKEDITOR.event.call( this );
-                // Make a clone of the config object, to avoid having it touched by our code. (#9636)
+                // Make a clone of the config object, to avoid having it touched by our code. (http://dev.ckeditor.com/ticket/9636)
                instanceConfig = instanceConfig && CKEDITOR.tools.clone( instanceConfig );
                // if editor is created off one page element.
@@ -223,7 +223,7 @@
        function updateCommandsContext( editor, path, forceRefresh ) {
                // Commands cannot be refreshed without a path. In edge cases
                // it may happen that there's no selection when this function is executed.
-                // For example when active filter is changed in #10877.
+                // For example when active filter is changed in http://dev.ckeditor.com/ticket/10877.
                if ( !path )
                        return;
@@ -270,7 +270,7 @@
                } else {
                        // Load the custom configuration file.
                        // To resolve customConfig race conflicts, use scriptLoader#queue
-                        // instead of scriptLoader#load (#6504).
+                        // instead of scriptLoader#load (http://dev.ckeditor.com/ticket/6504).
                        CKEDITOR.scriptLoader.queue( customConfig, function() {
                                // If the CKEDITOR.editorConfig function has been properly
                                // defined in the custom configuration file, cache it.
@@ -654,24 +654,49 @@
                return editor.blockless ? CKEDITOR.ENTER_BR : enterMode;
        }
-        // Create DocumentFragment from specified ranges. For now it handles only tables in Firefox
+        // Create DocumentFragment from specified ranges. For now it handles only tables
-        // and returns DocumentFragment from the 1. range for other cases. (#13884)
+        // and returns DocumentFragment from the 1. range for other cases. (http://dev.ckeditor.com/ticket/13884)
        function createDocumentFragmentFromRanges( ranges, editable ) {
                var docFragment = new CKEDITOR.dom.documentFragment(),
                        tableClone,
                        currentRow,
                        currentRowClone;
+                // We must handle two cases here:
+                // 1. <tr>[<td>Cell</td>]</tr> (IE9+, Edge, Chrome, Firefox)
+                // 2. <td>[Cell]</td> (IE8-, Safari)
+                function isSelectedCell( range ) {
+                        var start = range.startContainer,
+                                end = range.endContainer;
+                        if ( start.is && ( start.is( 'tr' ) ||
+                                ( start.is( 'td' ) && start.equals( end ) && range.endOffset === start.getChildCount() ) ) ) {
+                                return true;
+                        }
+                        return false;
+                }
+                function cloneCell( range ) {
+                        var start = range.startContainer;
+                        if ( start.is( 'tr' ) ) {
+                                return range.cloneContents();
+                        }
+                        return start.clone( true );
+                }
                for ( var i = 0; i < ranges.length; i++ ) {
                        var range = ranges[ i ],
-                                container = range.startContainer;
+                                container = range.startContainer.getAscendant( 'tr', true );
-                        if ( container.getName && container.getName() == 'tr' ) {
+                        if ( isSelectedCell( range ) ) {
                                if ( !tableClone ) {
                                        tableClone = container.getAscendant( 'table' ).clone();
-                                        tableClone.append( container.getAscendant( 'tbody' ).clone() );
+                                        tableClone.append( container.getAscendant( { thead: 1, tbody: 1, tfoot: 1 } ).clone() );
                                        docFragment.append( tableClone );
-                                        tableClone = tableClone.findOne( 'tbody' );
+                                        tableClone = tableClone.findOne( 'thead, tbody, tfoot' );
                                }
                                if ( !( currentRow && currentRow.equals( container ) ) ) {
@@ -680,7 +705,7 @@
                                        tableClone.append( currentRowClone );
                                }
-                                currentRowClone.append( range.cloneContents() );
+                                currentRowClone.append( cloneCell( range ) );
                        } else {
                                // If there was something else copied with table,
                                // append it to DocumentFragment.
@@ -717,7 +742,7 @@
                        // This guarantees that commands added before first editor#mode
                        // aren't immediately updated, but waits for editor#mode and that
                        // commands added later are immediately refreshed, even when added
-                        // before instanceReady. #10103, #10249
+                        // before instanceReady. http://dev.ckeditor.com/ticket/10103, http://dev.ckeditor.com/ticket/10249
                        if ( this.mode )
                                updateCommand( this, cmd );
@@ -761,7 +786,7 @@
                                                } );
                                        }
-                                        // Remove 'submit' events registered on form element before destroying.(#3988)
+                                        // Remove 'submit' events registered on form element before destroying.(http://dev.ckeditor.com/ticket/3988)
                                        editor.on( 'destroy', function() {
                                                form.removeListener( 'submit', onSubmit );
                                        } );
@@ -771,7 +796,7 @@
                        function onSubmit( evt ) {
                                editor.updateElement();
-                                // #8031 If textarea had required attribute and editor is empty fire 'required' event and if
+                                // http://dev.ckeditor.com/ticket/8031 If textarea had required attribute and editor is empty fire 'required' event and if
                                // it was cancelled, prevent submitting the form.
                                if ( editor._.required && !element.getValue() && editor.fire( 'required' ) === false ) {
                                        // When user press save button event (evt) is undefined (see save plugin).
@@ -860,10 +885,10 @@
                 *
                 *              editorInstance.execCommand( 'bold' );
                 *
-                 * @param {String} commandName The indentifier name of the command.
+                 * @param {String} commandName The identifier name of the command.
-                 * @param {Object} [data] The data to be passed to the command.
+                 * @param {Object} [data] The data to be passed to the command. It defaults to
-                 * @returns {Boolean} `true` if the command was executed
+                 * an empty object starting from 4.7.0.
-                 * successfully, otherwise `false`.
+                 * @returns {Boolean} `true` if the command was executed successfully, `false` otherwise.
                 * @see CKEDITOR.editor#addCommand
                 */
                execCommand: function( commandName, data ) {
@@ -871,7 +896,7 @@
                        var eventData = {
                                name: commandName,
-                                commandData: data,
+                                commandData: data || {},
                                command: command
                        };
@@ -967,7 +992,7 @@
                                }
                                else {
                                        // If we don't have a proper element, set data to an empty string,
-                                        // as this method is expected to return a string. (#13385)
+                                        // as this method is expected to return a string. (http://dev.ckeditor.com/ticket/13385)
                                        data = '';
                                }
                        }
@@ -1069,7 +1094,7 @@
                                this.readOnly = isReadOnly;
                                // Block or release BACKSPACE key according to current read-only
-                                // state to prevent browser's history navigation (#9761).
+                                // state to prevent browser's history navigation (http://dev.ckeditor.com/ticket/9761).
                                this.keystrokeHandler.blockedKeystrokes[ 8 ] = +isReadOnly;
                                this.editable().setReadOnly( isReadOnly );
@@ -1198,17 +1223,20 @@
                 */
                extractSelectedHtml: function( toString, removeEmptyBlock ) {
                        var editable = this.editable(),
-                                ranges = this.getSelection().getRanges();
+                                ranges = this.getSelection().getRanges(),
+                                docFragment = new CKEDITOR.dom.documentFragment(),
+                                i;
                        if ( !editable || ranges.length === 0 ) {
                                return null;
                        }
-                        var range = ranges[ 0 ],
+                        for ( i = 0; i < ranges.length; i++ ) {
-                                docFragment = editable.extractHtmlFromRange( range, removeEmptyBlock );
+                                docFragment.append( editable.extractHtmlFromRange( ranges[ i ], removeEmptyBlock ) );
+                        }
                        if ( !removeEmptyBlock ) {
-                                this.getSelection().selectRanges( [ range ] );
+                                this.getSelection().selectRanges( [ ranges[ 0 ] ] );
                        }
                        return toString ? docFragment.getHtml() : docFragment;
@@ -1324,6 +1352,38 @@
                },
                /**
+                 * Returns the keystroke that is assigned to a specified {@link CKEDITOR.command}. If no keystroke is assigned,
+                 * it returns `null`.
+                 *
+                 * Since version 4.7.0 this function also accepts a `command` parameter as a string.
+                 *
+                 * @since 4.6.0
+                 * @param {CKEDITOR.command/String} command The {@link CKEDITOR.command} instance or a string with the command name.
+                 * @returns {Number/null} The keystroke assigned to the provided command or `null` if there is no keystroke.
+                 */
+                getCommandKeystroke: function( command ) {
+                        var commandInstance = ( typeof command === 'string' ? this.getCommand( command ) : command );
+                        if ( commandInstance ) {
+                                var commandName = CKEDITOR.tools.object.findKey( this.commands, commandInstance ),
+                                        keystrokes = this.keystrokeHandler.keystrokes,
+                                        key;
+                                // Some commands have a fake keystroke - for example CUT/COPY/PASTE commands are handled natively.
+                                if ( commandInstance.fakeKeystroke ) {
+                                        return commandInstance.fakeKeystroke;
+                                }
+                                for ( key in keystrokes ) {
+                                        if ( keystrokes.hasOwnProperty( key ) && keystrokes[ key ] == commandName ) {
+                                                return key;
+                                        }
+                                }
+                        }
+                        return null;
+                },
+                /**
                 * Shorthand for {@link CKEDITOR.filter#addFeature}.
                 *
                 * @since 4.1
@@ -1512,7 +1572,7 @@ CKEDITOR.ELEMENT_MODE_INLINE = 3;
 * @member CKEDITOR.config
 */
- /**
+/**
 * Customizes the {@link CKEDITOR.editor#title human-readable title} of this editor. This title is displayed in
 * tooltips and impacts various [accessibility aspects](#!/guide/dev_a11y-section-announcing-the-editor-on-the-page),
 * e.g. it is commonly used by screen readers for distinguishing editor instances and for navigation.
@@ -1811,6 +1871,14 @@ CKEDITOR.ELEMENT_MODE_INLINE = 3;
 */
 /**
+ * Event fired when the {@link #method-destroy} method is called,
+ * but before destroying the editor.
+ *
+ * @event beforeDestroy
+ * @param {CKEDITOR.editor} editor This editor instance.
+ */
+/**
 * Internal event to get the current data.
 *
 * @event beforeGetData
diff --git a/sources/core/editor_basic.js b/sources/core/editor_basic.js
index 14f3446..b7ab577 100644
--- a/sources/core/editor_basic.js
+++ b/sources/core/editor_basic.js
@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 * For licensing, see LICENSE.md or http://ckeditor.com/license
 */
diff --git a/sources/core/env.js b/sources/core/env.js
index 4410ce9..cbf089c 100644
--- a/sources/core/env.js
+++ b/sources/core/env.js
@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 * For licensing, see LICENSE.md or http://ckeditor.com/license
 */
@@ -136,7 +136,7 @@ if ( !CKEDITOR.env ) {
                                var domain = document.domain,
                                        hostname = window.location.hostname;
-                                return domain != hostname && domain != ( '[' + hostname + ']' ); // IPv6 IP support (#5434)
+                                return domain != hostname && domain != ( '[' + hostname + ']' ); // IPv6 IP support (http://dev.ckeditor.com/ticket/5434)
                        },
                        /**
diff --git a/sources/core/event.js b/sources/core/event.js
index 0dd1f41..89444b5 100644
--- a/sources/core/event.js
+++ b/sources/core/event.js
@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 * For licensing, see LICENSE.md or http://ckeditor.com/license
 */
diff --git a/sources/core/eventInfo.js b/sources/core/eventInfo.js
index e1cd65a..ea62ac9 100644
--- a/sources/core/eventInfo.js
+++ b/sources/core/eventInfo.js
@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 * For licensing, see LICENSE.md or http://ckeditor.com/license
 */
diff --git a/sources/core/filter.js b/sources/core/filter.js
index e9d5a37..3e64fc5 100644
--- a/sources/core/filter.js
+++ b/sources/core/filter.js
@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 * For licensing, see LICENSE.md or http://ckeditor.com/license
 */
@@ -158,7 +158,8 @@
                        },
                        // Object: element name => array of transformations groups.
                        transformations: {},
-                        cachedTests: {}
+                        cachedTests: {},
+                        cachedChecks: {}
                };
                // Register filter instance.
@@ -299,7 +300,7 @@
                                        if ( el.attributes[ 'data-cke-filter' ] == 'off' )
                                                return false;
-                                        // (#10260) Don't touch elements like spans with data-cke-* attribute since they're
+                                        // (http://dev.ckeditor.com/ticket/10260) Don't touch elements like spans with data-cke-* attribute since they're
                                        // responsible e.g. for placing markers, bookmarks, odds and stuff.
                                        // We love 'em and we don't wanna lose anything during the filtering.
                                        // '|' is to avoid tricky joints like data-="foo" + cke-="bar". Yes, they're possible.
@@ -346,7 +347,7 @@
                                if ( !element.parent )
                                        continue;
-                                // Handle custom elements as inline elements (#12683).
+                                // Handle custom elements as inline elements (http://dev.ckeditor.com/ticket/12683).
                                parentDtd = DTD[ element.parent.name ] || DTD.span;
                                switch ( check.check ) {
@@ -806,6 +807,32 @@
                } )(),
                /**
+                 * Returns a clone of this filter instance.
+                 *
+                 * @since 4.7.3
+                 * @returns {CKEDITOR.filter}
+                 */
+                clone: function() {
+                        var ret = new CKEDITOR.filter(),
+                                clone = CKEDITOR.tools.clone;
+                        // Cloning allowed content related things.
+                        ret.allowedContent = clone( this.allowedContent );
+                        ret._.allowedRules = clone( this._.allowedRules );
+                        // Disallowed content rules.
+                        ret.disallowedContent = clone( this.disallowedContent );
+                        ret._.disallowedRules = clone( this._.disallowedRules );
+                        ret._.transformations = clone( this._.transformations );
+                        ret.disabled = this.disabled;
+                        ret.editor = this.editor;
+                        return ret;
+                },
+                /**
                 * Destroys the filter instance and removes it from the global {@link CKEDITOR.filter#instances} object.
                 *
                 * @since 4.4.5
@@ -1248,22 +1275,20 @@
                        styles = styleDef.styles,
                        attrs = styleDef.attributes || {};
-                if ( styles ) {
+                if ( styles && !CKEDITOR.tools.isEmpty( styles ) ) {
                        styles = copy( styles );
                        attrs.style = CKEDITOR.tools.writeCssText( styles, true );
                } else {
                        styles = {};
                }
-                var el = {
+                return {
                        name: styleDef.element,
                        attributes: attrs,
                        classes: attrs[ 'class' ] ? attrs[ 'class' ].split( /\s+/ ) : [],
                        styles: styles,
                        children: []
                };
-                return el;
        }
        // Mock hash based on string.
@@ -1873,6 +1898,7 @@
        //
        // TRANSFORMATIONS --------------------------------------------------------
        //
+        var transformationsTools;
        // Apply given transformations group to the element.
        function applyTransformationsGroup( filter, element, group ) {
@@ -2021,7 +2047,7 @@
         * @class CKEDITOR.filter.transformationsTools
         * @singleton
         */
-        var transformationsTools = CKEDITOR.filter.transformationsTools = {
+        transformationsTools = CKEDITOR.filter.transformationsTools = {
                /**
                 * Converts `width` and `height` attributes to styles.
                 *
@@ -2070,8 +2096,8 @@
                 * Converts length in the `styleName` style to a valid length attribute (like `width` or `height`).
                 *
                 * @param {CKEDITOR.htmlParser.element} element
-                 * @param {String} styleName Name of the style that will be converted.
+                 * @param {String} styleName The name of the style that will be converted.
-                 * @param {String} [attrName=styleName] Name of the attribute into which the style will be converted.
+                 * @param {String} [attrName=styleName] The name of the attribute into which the style will be converted.
                 */
                lengthToAttribute: function( element, styleName, attrName ) {
                        attrName = attrName || styleName;
@@ -2091,7 +2117,7 @@
                },
                /**
-                 * Converts the `align` attribute to the `float` style if not set. Attribute
+                 * Converts the `align` attribute to the `float` style if not set. The attribute
                 * is always removed.
                 *
                 * @param {CKEDITOR.htmlParser.element} element
@@ -2109,7 +2135,7 @@
                /**
                 * Converts the `float` style to the `align` attribute if not set.
-                 * Style is always removed.
+                 * The style is always removed.
                 *
                 * @param {CKEDITOR.htmlParser.element} element
                 */
@@ -2125,6 +2151,107 @@
                },
                /**
+                 * Converts the shorthand form of the `border` style to seperate styles.
+                 *
+                 * @param {CKEDITOR.htmlParser.element} element
+                 */
+                splitBorderShorthand: function( element ) {
+                        if ( !element.styles.border ) {
+                                return;
+                        }
+                        var widths = element.styles.border.match( /([\.\d]+\w+)/g ) || [ '0px' ];
+                        switch ( widths.length ) {
+                                case 1:
+                                        element.styles[ 'border-width' ] = widths[0];
+                                        break;
+                                case 2:
+                                        mapStyles( [ 0, 1, 0, 1 ] );
+                                        break;
+                                case 3:
+                                        mapStyles( [ 0, 1, 2, 1 ] );
+                                        break;
+                                case 4:
+                                        mapStyles( [ 0, 1, 2, 3 ] );
+                                        break;
+                        }
+                        element.styles[ 'border-style' ] = element.styles[ 'border-style' ] ||
+                                ( element.styles.border.match( /(none|hidden|dotted|dashed|solid|double|groove|ridge|inset|outset|initial|inherit)/ ) || [] )[ 0 ];
+                        if ( !element.styles[ 'border-style' ] )
+                                delete element.styles[ 'border-style' ];
+                        delete element.styles.border;
+                        function mapStyles( map ) {
+                                element.styles['border-top-width'] = widths[ map[0] ];
+                                element.styles['border-right-width'] = widths[ map[1] ];
+                                element.styles['border-bottom-width'] = widths[ map[2] ];
+                                element.styles['border-left-width'] = widths[ map[3] ];
+                        }
+                },
+                listTypeToStyle: function( element ) {
+                        if ( element.attributes.type ) {
+                                switch ( element.attributes.type ) {
+                                        case 'a':
+                                                element.styles[ 'list-style-type' ] = 'lower-alpha';
+                                                break;
+                                        case 'A':
+                                                element.styles[ 'list-style-type' ] = 'upper-alpha';
+                                                break;
+                                        case 'i':
+                                                element.styles[ 'list-style-type' ] = 'lower-roman';
+                                                break;
+                                        case 'I':
+                                                element.styles[ 'list-style-type' ] = 'upper-roman';
+                                                break;
+                                        case '1':
+                                                element.styles[ 'list-style-type' ] = 'decimal';
+                                                break;
+                                        default:
+                                                element.styles[ 'list-style-type' ] = element.attributes.type;
+                                }
+                        }
+                },
+                /**
+                 * Converts the shorthand form of the `margin` style to seperate styles.
+                 *
+                 * @param {CKEDITOR.htmlParser.element} element
+                 */
+                splitMarginShorthand: function( element ) {
+                        if ( !element.styles.margin ) {
+                                return;
+                        }
+                        var widths = element.styles.margin.match( /(\-?[\.\d]+\w+)/g ) || [ '0px' ];
+                        switch ( widths.length ) {
+                                case 1:
+                                        mapStyles( [ 0, 0, 0, 0 ] );
+                                        break;
+                                case 2:
+                                        mapStyles( [ 0, 1, 0, 1 ] );
+                                        break;
+                                case 3:
+                                        mapStyles( [ 0, 1, 2, 1 ] );
+                                        break;
+                                case 4:
+                                        mapStyles( [ 0, 1, 2, 3 ] );
+                                        break;
+                        }
+                        delete element.styles.margin;
+                        function mapStyles( map ) {
+                                element.styles['margin-top'] = widths[ map[0] ];
+                                element.styles['margin-right'] = widths[ map[1] ];
+                                element.styles['margin-bottom'] = widths[ map[2] ];
+                                element.styles['margin-left'] = widths[ map[3] ];
+                        }
+                },
+                /**
                 * Checks whether an element matches a given {@link CKEDITOR.style}.
                 * The element can be a "superset" of a style, e.g. it may have
                 * more classes, but needs to have at least those defined in the style.
@@ -2135,12 +2262,12 @@
                matchesStyle: elementMatchesStyle,
                /**
-                 * Transforms element to given form.
+                 * Transforms an element to a given form.
                 *
                 * Form may be a:
                 *
                 *      * {@link CKEDITOR.style},
-                 *      * string &ndash; the new name of an element.
+                 *      * string &ndash; the new name of the element.
                 *
                 * @param {CKEDITOR.htmlParser.element} el
                 * @param {CKEDITOR.style/String} form
@@ -2191,7 +2318,7 @@
 *      * {@link CKEDITOR.filter.allowedContentRules} &ndash; defined rules will be added
 *      to the {@link CKEDITOR.editor#filter}.
 *      * `true` &ndash; will disable the filter (data will not be filtered,
- *      all features will be activated).
+ *      all features will be activated). Reading [security best practices](#!/guide/dev_best_practices) before setting `true` is recommended.
 *      * default &ndash; the filter will be configured by loaded features
 *      (toolbar items, commands, etc.).
 *
diff --git a/sources/core/focusmanager.js b/sources/core/focusmanager.js
index ee1bc39..45c3137 100644
--- a/sources/core/focusmanager.js
+++ b/sources/core/focusmanager.js
@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 * For licensing, see LICENSE.md or http://ckeditor.com/license
 */
@@ -147,8 +147,9 @@
                 * @member CKEDITOR.focusManager
                 */
                blur: function( noDelay ) {
-                        if ( this._.locked )
+                        if ( this._.locked ) {
                                return;
+                        }
                        function doBlur() {
                                if ( this.hasFocus ) {
@@ -160,13 +161,14 @@
                                }
                        }
-                        if ( this._.timer )
+                        if ( this._.timer ) {
                                clearTimeout( this._.timer );
+                        }
                        var delay = CKEDITOR.focusManager._.blurDelay;
-                        if ( noDelay || !delay )
+                        if ( noDelay || !delay ) {
                                doBlur.call( this );
-                        else {
+                        } else {
                                this._.timer = CKEDITOR.tools.setTimeout( function() {
                                        delete this._.timer;
                                        doBlur.call( this );
diff --git a/sources/core/htmldataprocessor.js b/sources/core/htmldataprocessor.js
index d079e4d..79e996b 100644
--- a/sources/core/htmldataprocessor.js
+++ b/sources/core/htmldataprocessor.js
@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 * For licensing, see LICENSE.md or http://ckeditor.com/license
 */
@@ -56,7 +56,7 @@
                        // it up and apply the filter.
                        data = protectSource( data, editor );
-                        // Protect content of textareas. (#9995)
+                        // Protect content of textareas. (http://dev.ckeditor.com/ticket/9995)
                        // Do this before protecting attributes to avoid breaking:
                        // <textarea><img src="..." /></textarea>
                        data = protectElements( data, protectTextareaRegex );
@@ -67,23 +67,23 @@
                        data = protectAttributes( data );
                        // Protect elements than can't be set inside a DIV. E.g. IE removes
-                        // style tags from innerHTML. (#3710)
+                        // style tags from innerHTML. (http://dev.ckeditor.com/ticket/3710)
                        data = protectElements( data, protectElementsRegex );
                        // Certain elements has problem to go through DOM operation, protect
-                        // them by prefixing 'cke' namespace. (#3591)
+                        // them by prefixing 'cke' namespace. (http://dev.ckeditor.com/ticket/3591)
                        data = protectElementsNames( data );
                        // All none-IE browsers ignore self-closed custom elements,
-                        // protecting them into open-close. (#3591)
+                        // protecting them into open-close. (http://dev.ckeditor.com/ticket/3591)
                        data = protectSelfClosingElements( data );
                        // Compensate one leading line break after <pre> open as browsers
-                        // eat it up. (#5789)
+                        // eat it up. (http://dev.ckeditor.com/ticket/5789)
                        data = protectPreFormatted( data );
                        // There are attributes which may execute JavaScript code inside fixBin.
-                        // Encode them greedily. They will be unprotected right after getting HTML from fixBin. (#10)
+                        // Encode them greedily. They will be unprotected right after getting HTML from fixBin. (http://dev.ckeditor.com/ticket/10)
                        data = protectInsecureAttributes( data );
                        var fixBin = evtData.context || editor.editable().getName(),
@@ -99,7 +99,7 @@
                        // Call the browser to help us fixing a possibly invalid HTML
                        // structure.
                        var el = editor.document.createElement( fixBin );
-                        // Add fake character to workaround IE comments bug. (#3801)
+                        // Add fake character to workaround IE comments bug. (http://dev.ckeditor.com/ticket/3801)
                        el.setHtml( 'a' + data );
                        data = el.getHtml().substr( 1 );
@@ -128,7 +128,7 @@
                        data = CKEDITOR.htmlParser.fragment.fromHtml( data, evtData.context, fixBodyTag );
                        // The empty root element needs to be fixed by adding 'p' or 'div' into it.
-                        // This avoids the need to create that element on the first focus (#12630).
+                        // This avoids the need to create that element on the first focus (http://dev.ckeditor.com/ticket/12630).
                        if ( fixBodyTag ) {
                                fixEmptyRoot( data, fixBodyTag );
                        }
@@ -163,7 +163,7 @@
                editor.on( 'toDataFormat', function( evt ) {
                        var data = evt.data.dataValue;
-                        // #10854 - we need to strip leading blockless <br> which FF adds
+                        // http://dev.ckeditor.com/ticket/10854 - we need to strip leading blockless <br> which FF adds
                        // automatically when editable contains only non-editable content.
                        // We do that for every browser (so it's a constant behavior) and
                        // not in BR mode, in which chance of valid leading blockless <br> is higher.
@@ -192,7 +192,7 @@
                        data.writeChildrenHtml( writer );
                        data = writer.getHtml( true );
-                        // Restore those non-HTML protected source. (#4475,#4880)
+                        // Restore those non-HTML protected source. (http://dev.ckeditor.com/ticket/4475,http://dev.ckeditor.com/ticket/4880)
                        data = unprotectRealComments( data );
                        data = unprotectSource( data, editor );
@@ -448,7 +448,7 @@
                                return false;
                        // 1. For IE version >=8,  empty blocks are displayed correctly themself in wysiwiyg;
-                        // 2. For the rest, at least table cell and list item need no filler space. (#6248)
+                        // 2. For the rest, at least table cell and list item need no filler space. (http://dev.ckeditor.com/ticket/6248)
                        if ( !isOutput && !CKEDITOR.env.needsBrFiller &&
                                ( document.documentMode > 7 ||
                                        block.name in CKEDITOR.dtd.tr ||
@@ -484,7 +484,7 @@
        }
        // Regex to scan for &nbsp; at the end of blocks, which are actually placeholders.
-        // Safari transforms the &nbsp; to \xa0. (#4172)
+        // Safari transforms the &nbsp; to \xa0. (http://dev.ckeditor.com/ticket/4172)
        var tailNbspRegex = /(?:&nbsp;|\xa0)$/;
        var protectedSourceMarker = '{cke_protected}';
@@ -563,18 +563,35 @@
                        // active in the editing area (IE|WebKit).
                        [ ( /^on/ ), 'data-cke-pa-on' ],
+                        // Prevent iframe's srcdoc attribute from being evaluated in the editable.
+                        [ ( /^srcdoc/ ), 'data-cke-pa-srcdoc' ],
                        // Don't let some old expando enter editor. Concerns only IE8,
                        // but for consistency remove on all browsers.
                        [ ( /^data-cke-expando$/ ), '' ]
-                ]
+                ],
+                elements: {
+                        // Prevent iframe's src attribute with javascript code or data protocol from being evaluated in the editable.
+                        iframe: function( element ) {
+                                if ( element.attributes && element.attributes.src ) {
+                                        var src = element.attributes.src.toLowerCase().replace( /[^a-z]/gi, '' );
+                                        if ( src.indexOf( 'javascript' ) === 0 || src.indexOf( 'data' ) === 0 ) {
+                                                element.attributes[ 'data-cke-pa-src' ] = element.attributes.src;
+                                                delete element.attributes.src;
+                                        }
+                                }
+                        }
+                }
        };
-        // Disable form elements editing mode provided by some browsers. (#5746)
+        // Disable form elements editing mode provided by some browsers. (http://dev.ckeditor.com/ticket/5746)
        function protectReadOnly( element ) {
                var attrs = element.attributes;
                // We should flag that the element was locked by our code so
-                // it'll be editable by the editor functions (#6046).
+                // it'll be editable by the editor functions (http://dev.ckeditor.com/ticket/6046).
                if ( attrs.contenteditable != 'false' )
                        attrs[ 'data-cke-editable' ] = attrs.contenteditable ? 'true' : 1;
@@ -602,7 +619,7 @@
                                }
                        },
-                        // Remove empty link but not empty anchor. (#3829, #13516)
+                        // Remove empty link but not empty anchor. (http://dev.ckeditor.com/ticket/3829, http://dev.ckeditor.com/ticket/13516)
                        a: function( element ) {
                                var attrs = element.attributes;
@@ -641,7 +658,7 @@
                                        if ( attribs[ 'data-cke-temp' ] )
                                                return false;
-                                        // Remove duplicated attributes - #3789.
+                                        // Remove duplicated attributes - http://dev.ckeditor.com/ticket/3789.
                                        var attributeNames = [ 'name', 'href', 'src' ],
                                                savedAttributeName;
                                        for ( var i = 0; i < attributeNames.length; i++ ) {
@@ -653,7 +670,7 @@
                                return element;
                        },
-                        // The contents of table should be in correct order (#4809).
+                        // The contents of table should be in correct order (http://dev.ckeditor.com/ticket/4809).
                        table: function( element ) {
                                // Clone the array as it would become empty during the sort call.
                                var children = element.children.slice( 0 );
@@ -712,7 +729,7 @@
                        title: function( element ) {
                                var titleText = element.children[ 0 ];
-                                // Append text-node to title tag if not present (i.e. non-IEs) (#9882).
+                                // Append text-node to title tag if not present (i.e. non-IEs) (http://dev.ckeditor.com/ticket/9882).
                                !titleText && append( element, titleText = new CKEDITOR.htmlParser.text() );
                                // Transfer data-saved title to title tag.
@@ -733,7 +750,7 @@
        if ( CKEDITOR.env.ie ) {
                // IE outputs style attribute in capital letters. We should convert
-                // them back to lower case, while not hurting the values (#5930)
+                // them back to lower case, while not hurting the values (http://dev.ckeditor.com/ticket/5930)
                defaultHtmlFilterRulesForAll.attributes.style = function( value ) {
                        return value.replace( /(^|;)([^\:]+)/g, function( match ) {
                                return match.toLowerCase();
@@ -741,7 +758,7 @@
                };
        }
-        // Disable form elements editing mode provided by some browsers. (#5746)
+        // Disable form elements editing mode provided by some browsers. (http://dev.ckeditor.com/ticket/5746)
        function unprotectReadyOnly( element ) {
                var attrs = element.attributes;
                switch ( attrs[ 'data-cke-editable' ] ) {
@@ -773,7 +790,7 @@
                //
                //      'data-x' => '&lt;a href=&quot;X&quot;'
                //
-                // which, can be easily filtered out (#11508).
+                // which, can be easily filtered out (http://dev.ckeditor.com/ticket/11508).
                protectAttributeRegex = /([\w-:]+)\s*=\s*(?:(?:"[^"]*")|(?:'[^']*')|(?:[^ "'>]+))/gi,
                protectAttributeNameRegex = /^(href|src|name)$/i;
@@ -790,8 +807,8 @@
        function protectAttributes( html ) {
                return html.replace( protectElementRegex, function( element, tag, attributes ) {
                        return '<' + tag + attributes.replace( protectAttributeRegex, function( fullAttr, attrName ) {
-                                // Avoid corrupting the inline event attributes (#7243).
+                                // Avoid corrupting the inline event attributes (http://dev.ckeditor.com/ticket/7243).
-                                // We should not rewrite the existed protected attributes, e.g. clipboard content from editor. (#5218)
+                                // We should not rewrite the existed protected attributes, e.g. clipboard content from editor. (http://dev.ckeditor.com/ticket/5218)
                                if ( protectAttributeNameRegex.test( attrName ) && attributes.indexOf( 'data-cke-saved-' + attrName ) == -1 )
                                        return ' data-cke-saved-' + fullAttr + ' data-cke-' + CKEDITOR.rnd + '-' + fullAttr;
@@ -880,7 +897,7 @@
                        // <noscript> tags (get lost in IE and messed up in FF).
                        /<noscript[\s\S]*?<\/noscript>/gi,
-                        // Avoid meta tags being stripped (#8117).
+                        // Avoid meta tags being stripped (http://dev.ckeditor.com/ticket/8117).
                        /<meta[\s\S]*?\/?>/gi
                ].concat( protectRegexes );
@@ -894,7 +911,7 @@
                for ( var i = 0; i < regexes.length; i++ ) {
                        data = data.replace( regexes[ i ], function( match ) {
-                                match = match.replace( tempRegex, // There could be protected source inside another one. (#3869).
+                                match = match.replace( tempRegex, // There could be protected source inside another one. (http://dev.ckeditor.com/ticket/3869).
                                function( $, isComment, id ) {
                                        return protectedHtml[ id ];
                                } );
@@ -912,7 +929,7 @@
                // Different protection pattern is used for those that
                // live in attributes to avoid from being HTML encoded.
-                // Why so serious? See #9205, #8216, #7805, #11754, #11846.
+                // Why so serious? See http://dev.ckeditor.com/ticket/9205, http://dev.ckeditor.com/ticket/8216, http://dev.ckeditor.com/ticket/7805, http://dev.ckeditor.com/ticket/11754, http://dev.ckeditor.com/ticket/11846.
                data = data.replace( /<\w+(?:\s+(?:(?:[^\s=>]+\s*=\s*(?:[^'"\s>]+|'[^']*'|"[^"]*"))|[^\s=\/>]+))+\s*\/?>/g, function( match ) {
                        return match.replace( /<!--\{cke_protected\}([^>]*)-->/g, function( match, data ) {
                                store[ store.id ] = decodeURIComponent( data );
@@ -922,7 +939,7 @@
                // This RegExp searches for innerText in all the title/iframe/textarea elements.
                // This is because browser doesn't allow HTML in these elements, that's why we can't
-                // nest comments in there. (#11223)
+                // nest comments in there. (http://dev.ckeditor.com/ticket/11223)
                data = data.replace( /<(title|iframe|textarea)([^>]*)>([\s\S]*?)<\/\1>/g, function( match, tagName, tagAttributes, innerText ) {
                        return '<' + tagName + tagAttributes + '>' + unprotectSource( unprotectRealComments( innerText ), editor ) + '</' + tagName + '>';
                } );
@@ -971,7 +988,7 @@
 *              {@link CKEDITOR.htmlParser.fragment} {@link CKEDITOR.htmlParser.element}.
 *      * 5-9: Data is available in the parsed format, but {@link CKEDITOR.htmlDataProcessor#dataFilter}
 *              is not applied yet.
- *      * 6: Data is filtered with the {CKEDITOR.filter content filter}.
+ *      * 6: Data is filtered with the {@link CKEDITOR.filter content filter}.
 *      * 10: Data is processed with {@link CKEDITOR.htmlDataProcessor#dataFilter}.
 *      * 10-14: Data is available in the parsed format and {@link CKEDITOR.htmlDataProcessor#dataFilter}
 *              has already been applied.
diff --git a/sources/core/htmlparser.js b/sources/core/htmlparser.js
index dffde95..c95257c 100644
--- a/sources/core/htmlparser.js
+++ b/sources/core/htmlparser.js
@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 * For licensing, see LICENSE.md or http://ckeditor.com/license
 */
@@ -163,7 +163,7 @@ CKEDITOR.htmlParser = function() {
                                        tagName = tagName.toLowerCase();
                                        // There are some tag names that can break things, so let's
-                                        // simply ignore them when parsing. (#5224)
+                                        // simply ignore them when parsing. (http://dev.ckeditor.com/ticket/5224)
                                        if ( /="/.test( tagName ) )
                                                continue;
diff --git a/sources/core/htmlparser/basicwriter.js b/sources/core/htmlparser/basicwriter.js
index 62a97ef..61447f0 100644
--- a/sources/core/htmlparser/basicwriter.js
+++ b/sources/core/htmlparser/basicwriter.js
@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 * For licensing, see LICENSE.md or http://ckeditor.com/license
 */
@@ -67,7 +67,7 @@ CKEDITOR.htmlParser.basicWriter = CKEDITOR.tools.createClass( {
                 * @param {String} attValue The attribute value.
                 */
                attribute: function( attName, attValue ) {
-                        // Browsers don't always escape special character in attribute values. (#4683, #4719).
+                        // Browsers don't always escape special character in attribute values. (http://dev.ckeditor.com/ticket/4683, http://dev.ckeditor.com/ticket/4719).
                        if ( typeof attValue == 'string' )
                                attValue = CKEDITOR.tools.htmlEncodeAttr( attValue );
diff --git a/sources/core/htmlparser/cdata.js b/sources/core/htmlparser/cdata.js
index 4ece2b7..be8c5cf 100644
--- a/sources/core/htmlparser/cdata.js
+++ b/sources/core/htmlparser/cdata.js
@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 * For licensing, see LICENSE.md or http://ckeditor.com/license
 */
diff --git a/sources/core/htmlparser/comment.js b/sources/core/htmlparser/comment.js
index 171c62e..14a38f3 100644
--- a/sources/core/htmlparser/comment.js
+++ b/sources/core/htmlparser/comment.js
@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 * For licensing, see LICENSE.md or http://ckeditor.com/license
 */
diff --git a/sources/core/htmlparser/element.js b/sources/core/htmlparser/element.js
index 3654322..224d3e6 100644
--- a/sources/core/htmlparser/element.js
+++ b/sources/core/htmlparser/element.js
@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 * For licensing, see LICENSE.md or http://ckeditor.com/license
 */
@@ -35,7 +35,7 @@ CKEDITOR.htmlParser.element = function( name, attributes ) {
         */
        this.children = [];
-        // Reveal the real semantic of our internal custom tag name (#6639),
+        // Reveal the real semantic of our internal custom tag name (http://dev.ckeditor.com/ticket/6639),
        // when resolving whether it's block like.
        var realName = name || '',
                prefixed = realName.match( /^cke:(.*)/ );
@@ -56,7 +56,7 @@ CKEDITOR.htmlParser.element = function( name, attributes ) {
 };
 /**
- * Object presentation of CSS style declaration text.
+ * Object presentation of the CSS style declaration text.
 *
 * @class
 * @constructor Creates a `cssStyle` class instance.
@@ -419,7 +419,7 @@ CKEDITOR.htmlParser.cssStyle = function() {
                 *
                 * @since 4.3
                 * @param {Number} index Index at which the element will be split &mdash; `0` means the beginning,
-                 * `1` after first child node, etc.
+                 * `1` after the first child node, etc.
                 * @returns {CKEDITOR.htmlParser.element} The new element following this one.
                 */
                split: function( index ) {
@@ -443,6 +443,38 @@ CKEDITOR.htmlParser.cssStyle = function() {
                },
                /**
+                 * Searches through the current node children to find nodes matching the `criteria`.
+                 *
+                 * @param {String/Function} criteria Tag name or evaluator function.
+                 * @param {Boolean} [recursive=false]
+                 * @returns {CKEDITOR.htmlParser.node[]}
+                 */
+                find: function( criteria, recursive ) {
+                        if ( recursive === undefined ) {
+                                recursive = false;
+                        }
+                        var ret = [],
+                                i;
+                        for     ( i = 0; i < this.children.length; i++ ) {
+                                var curChild = this.children[ i ];
+                                if ( typeof criteria == 'function' && criteria( curChild ) ) {
+                                        ret.push( curChild );
+                                } else if ( typeof criteria == 'string' && curChild.name === criteria ) {
+                                        ret.push( curChild );
+                                }
+                                if ( recursive && curChild.find ) {
+                                        ret = ret.concat( curChild.find( criteria, recursive ) );
+                                }
+                        }
+                        return ret;
+                },
+                /**
                 * Adds a class name to the list of classes.
                 *
                 * @since 4.4
@@ -511,8 +543,8 @@ CKEDITOR.htmlParser.cssStyle = function() {
                        if ( !ctx.nonEditable && this.attributes.contenteditable == 'false' )
                                changes.push( 'nonEditable', true );
-                        // A context to be given nestedEditable must be nonEditable first (by inheritance) (#11372, #11698).
+                        // A context to be given nestedEditable must be nonEditable first (by inheritance) (http://dev.ckeditor.com/ticket/11372, http://dev.ckeditor.com/ticket/11698).
-                        // Special case: #11504 - filter starts on <body contenteditable=true>,
+                        // Special case: http://dev.ckeditor.com/ticket/11504 - filter starts on <body contenteditable=true>,
                        // so ctx.nonEditable has not been yet set to true.
                        else if ( ctx.nonEditable && !ctx.nestedEditable && this.attributes.contenteditable == 'true' )
                                changes.push( 'nestedEditable', true );
diff --git a/sources/core/htmlparser/filter.js b/sources/core/htmlparser/filter.js
index 72767b5..db6b91c 100644
--- a/sources/core/htmlparser/filter.js
+++ b/sources/core/htmlparser/filter.js
@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 * For licensing, see LICENSE.md or http://ckeditor.com/license
 */
diff --git a/sources/core/htmlparser/fragment.js b/sources/core/htmlparser/fragment.js
index c062986..7ef915c 100644
--- a/sources/core/htmlparser/fragment.js
+++ b/sources/core/htmlparser/fragment.js
@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 * For licensing, see LICENSE.md or http://ckeditor.com/license
 */
@@ -61,7 +61,7 @@ CKEDITOR.htmlParser.fragment = function() {
                if ( node.attributes[ 'data-cke-survive' ] )
                        return false;
-                // Empty link is to be removed when empty but not anchor. (#7894)
+                // Empty link is to be removed when empty but not anchor. (http://dev.ckeditor.com/ticket/7894)
                return node.name == 'a' && node.attributes.href || CKEDITOR.dtd.$removeEmpty[ node.name ];
        }
@@ -130,7 +130,7 @@ CKEDITOR.htmlParser.fragment = function() {
                                                i--;
                                        } else {
                                                // Some element of the same type cannot be nested, flat them,
-                                                // e.g. <a href="#">foo<a href="#">bar</a></a>. (#7894)
+                                                // e.g. <a href="#">foo<a href="#">bar</a></a>. (http://dev.ckeditor.com/ticket/7894)
                                                if ( pendingName == currentNode.name )
                                                        addElement( currentNode, currentNode.parent, 1 ), i--;
                                        }
@@ -143,7 +143,7 @@ CKEDITOR.htmlParser.fragment = function() {
                                addElement( pendingBRs.shift(), currentNode );
                }
-                // Rtrim empty spaces on block end boundary. (#3585)
+                // Rtrim empty spaces on block end boundary. (http://dev.ckeditor.com/ticket/3585)
                function removeTailWhitespace( element ) {
                        if ( element._.isBlockLike && element.name != 'pre' && element.name != 'textarea' ) {
@@ -275,10 +275,10 @@ CKEDITOR.htmlParser.fragment = function() {
                                // If the element cannot be child of the current element.
                                if ( !element.isUnknown && !currentNode.isUnknown && !currentDtd[ tagName ] ) {
                                        // Current node doesn't have a close tag, time for a close
-                                        // as this element isn't fit in. (#7497)
+                                        // as this element isn't fit in. (http://dev.ckeditor.com/ticket/7497)
                                        if ( currentNode.isOptionalClose )
                                                parser.onTagClose( currentName );
-                                        // Fixing malformed nested lists by moving it into a previous list item. (#3828)
+                                        // Fixing malformed nested lists by moving it into a previous list item. (http://dev.ckeditor.com/ticket/3828)
                                        else if ( tagName in listBlocks && currentName in listBlocks ) {
                                                var children = currentNode.children,
                                                        lastChild = children[ children.length - 1 ];
@@ -291,7 +291,7 @@ CKEDITOR.htmlParser.fragment = function() {
                                                currentNode = lastChild;
                                        }
                                        // Establish new list root for orphan list items, but NOT to create
-                                        // new list for the following ones, fix them instead. (#6975)
+                                        // new list for the following ones, fix them instead. (http://dev.ckeditor.com/ticket/6975)
                                        // <dl><dt>foo<dd>bar</dl>
                                        // <ul><li>foo<li>bar</ul>
                                        else if ( tagName in CKEDITOR.dtd.$listItem &&
@@ -409,7 +409,7 @@ CKEDITOR.htmlParser.fragment = function() {
                        var currentName = currentNode.name,
                                currentDtd = currentName ? ( CKEDITOR.dtd[ currentName ] || ( currentNode._.isBlockLike ? CKEDITOR.dtd.div : CKEDITOR.dtd.span ) ) : rootDtd;
-                        // Fix orphan text in list/table. (#8540) (#8870)
+                        // Fix orphan text in list/table. (http://dev.ckeditor.com/ticket/8540) (http://dev.ckeditor.com/ticket/8870)
                        if ( !inTextarea && !currentDtd[ '#' ] && currentName in nonBreakingBlocks ) {
                                parser.onTagOpen( structureFixes[ currentName ] || '' );
                                parser.onText( text );
diff --git a/sources/core/htmlparser/node.js b/sources/core/htmlparser/node.js
index 0f1b307..b38c8a8 100644
--- a/sources/core/htmlparser/node.js
+++ b/sources/core/htmlparser/node.js
@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 * For licensing, see LICENSE.md or http://ckeditor.com/license
 */
diff --git a/sources/core/htmlparser/text.js b/sources/core/htmlparser/text.js
index 07cb865..190e85a 100644
--- a/sources/core/htmlparser/text.js
+++ b/sources/core/htmlparser/text.js
@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 * For licensing, see LICENSE.md or http://ckeditor.com/license
 */
diff --git a/sources/core/keystrokehandler.js b/sources/core/keystrokehandler.js
index e2a6bcd..c84089b 100644
--- a/sources/core/keystrokehandler.js
+++ b/sources/core/keystrokehandler.js
@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 * For licensing, see LICENSE.md or http://ckeditor.com/license
 */
diff --git a/sources/core/lang.js b/sources/core/lang.js
index 3519923..06f3a2a 100644
--- a/sources/core/lang.js
+++ b/sources/core/lang.js
@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 * For licensing, see LICENSE.md or http://ckeditor.com/license
 */
@@ -17,10 +17,10 @@
                 *              alert( CKEDITOR.lang.languages.en ); // 1
                 */
                languages: {
-                        af: 1, ar: 1, bg: 1, bn: 1, bs: 1, ca: 1, cs: 1, cy: 1, da: 1, de: 1, 'de-ch': 1, el: 1,
+                        af: 1, ar: 1, az: 1, bg: 1, bn: 1, bs: 1, ca: 1, cs: 1, cy: 1, da: 1, de: 1, 'de-ch': 1, el: 1,
-                        'en-au': 1, 'en-ca': 1, 'en-gb': 1, en: 1, eo: 1, es: 1, et: 1, eu: 1, fa: 1, fi: 1, fo: 1,
+                        'en-au': 1, 'en-ca': 1, 'en-gb': 1, en: 1, eo: 1, es: 1, 'es-mx':1, et: 1, eu: 1, fa: 1, fi: 1, fo: 1,
                        'fr-ca': 1, fr: 1, gl: 1, gu: 1, he: 1, hi: 1, hr: 1, hu: 1, id: 1, is: 1, it: 1, ja: 1, ka: 1,
-                        km: 1, ko: 1, ku: 1, lt: 1, lv: 1, mk: 1, mn: 1, ms: 1, nb: 1, nl: 1, no: 1, pl: 1, 'pt-br': 1,
+                        km: 1, ko: 1, ku: 1, lt: 1, lv: 1, mk: 1, mn: 1, ms: 1, nb: 1, nl: 1, no: 1, oc: 1, pl: 1, 'pt-br': 1,
                        pt: 1, ro: 1, ru: 1, si: 1, sk: 1, sl: 1, sq: 1, 'sr-latn': 1, sr: 1, sv: 1, th: 1, tr: 1, tt: 1, ug: 1,
                        uk: 1, vi: 1, 'zh-cn': 1, zh: 1
                },
diff --git a/sources/core/loader.js b/sources/core/loader.js
index 5a108df..dc02511 100644
--- a/sources/core/loader.js
+++ b/sources/core/loader.js
@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 * For licensing, see LICENSE.md or http://ckeditor.com/license
 */
@@ -142,7 +142,7 @@ if ( !CKEDITOR.loader ) {
                                }
                                // We must guarantee the execution order of the scripts, so we
-                                // need to load them one by one. (#4145)
+                                // need to load them one by one. (http://dev.ckeditor.com/ticket/4145)
                                // The following if/else block has been taken from the scriptloader core code.
                                if ( typeof script.onreadystatechange !== 'undefined' ) {
                                        /** @ignore */
@@ -156,7 +156,7 @@ if ( !CKEDITOR.loader ) {
                                        /** @ignore */
                                        script.onload = function() {
                                                // Some browsers, such as Safari, may call the onLoad function
-                                                // immediately. Which will break the loading sequence. (#3661)
+                                                // immediately. Which will break the loading sequence. (http://dev.ckeditor.com/ticket/3661)
                                                setTimeout( function() {
                                                        onScriptLoaded( scriptName );
                                                }, 0 );
diff --git a/sources/core/log.js b/sources/core/log.js
index 6981612..228789e 100644
--- a/sources/core/log.js
+++ b/sources/core/log.js
@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 * For licensing, see LICENSE.md or http://ckeditor.com/license
 */
diff --git a/sources/core/plugindefinition.js b/sources/core/plugindefinition.js
index caff957..9ff7683 100644
--- a/sources/core/plugindefinition.js
+++ b/sources/core/plugindefinition.js
@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 * For licensing, see LICENSE.md or http://ckeditor.com/license
 */
diff --git a/sources/core/plugins.js b/sources/core/plugins.js
index 8e6c952..75cc41e 100644
--- a/sources/core/plugins.js
+++ b/sources/core/plugins.js
@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 * For licensing, see LICENSE.md or http://ckeditor.com/license
 */
diff --git a/sources/core/resourcemanager.js b/sources/core/resourcemanager.js
index 7ba88a8..c33c0f8 100644
--- a/sources/core/resourcemanager.js
+++ b/sources/core/resourcemanager.js
@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 * For licensing, see LICENSE.md or http://ckeditor.com/license
 */
@@ -124,13 +124,13 @@ CKEDITOR.resourceManager.prototype = {
         * Registers one or more resources to be loaded from an external path
         * instead of the core base path.
         *
-         *              // Loads a plugin from '/myplugin/samples/plugin.js'.
+         *              // Loads a plugin from '/myplugins/sample/plugin.js'.
         *              CKEDITOR.plugins.addExternal( 'sample', '/myplugins/sample/' );
         *
-         *              // Loads a plugin from '/myplugin/samples/my_plugin.js'.
+         *              // Loads a plugin from '/myplugins/sample/my_plugin.js'.
         *              CKEDITOR.plugins.addExternal( 'sample', '/myplugins/sample/', 'my_plugin.js' );
         *
-         *              // Loads a plugin from '/myplugin/samples/my_plugin.js'.
+         *              // Loads a plugin from '/myplugins/sample/my_plugin.js'.
         *              CKEDITOR.plugins.addExternal( 'sample', '/myplugins/sample/my_plugin.js', '' );
         *
         * @param {String} names The resource names, separated by commas.
diff --git a/sources/core/scriptloader.js b/sources/core/scriptloader.js
index 9ad536e..356996f 100644
--- a/sources/core/scriptloader.js
+++ b/sources/core/scriptloader.js
@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 * For licensing, see LICENSE.md or http://ckeditor.com/license
 */
@@ -119,8 +119,8 @@ CKEDITOR.scriptLoader = ( function() {
                                        } );
                                        if ( callback ) {
-                                                if ( CKEDITOR.env.ie && CKEDITOR.env.version < 11 ) {
+                                                // The onload or onerror event does not fire in IE8 and IE9 Quirks Mode (http://dev.ckeditor.com/ticket/14849).
-                                                        // FIXME: For IE, we are not able to return false on error (like 404).
+                                                if ( CKEDITOR.env.ie && ( CKEDITOR.env.version <= 8 || CKEDITOR.env.ie9Compat ) ) {
                                                        script.$.onreadystatechange = function() {
                                                                if ( script.$.readyState == 'loaded' || script.$.readyState == 'complete' ) {
                                                                        script.$.onreadystatechange = null;
@@ -130,13 +130,12 @@ CKEDITOR.scriptLoader = ( function() {
                                                } else {
                                                        script.$.onload = function() {
                                                                // Some browsers, such as Safari, may call the onLoad function
-                                                                // immediately. Which will break the loading sequence. (#3661)
+                                                                // immediately. Which will break the loading sequence. (http://dev.ckeditor.com/ticket/3661)
                                                                setTimeout( function() {
                                                                        onLoad( url, true );
                                                                }, 0 );
                                                        };
-                                                        // FIXME: Opera and Safari will not fire onerror.
                                                        script.$.onerror = function() {
                                                                onLoad( url, false );
                                                        };
diff --git a/sources/core/selection.js b/sources/core/selection.js
index 573b890..d44db3b 100644
--- a/sources/core/selection.js
+++ b/sources/core/selection.js
@@ -1,9 +1,217 @@
 /**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 * For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 ( function() {
+        var isMSSelection = typeof window.getSelection != 'function',
+                nextRev = 1,
+                // http://dev.ckeditor.com/ticket/13816
+                fillingCharSequence = CKEDITOR.tools.repeat( '\u200b', 7 ),
+                fillingCharSequenceRegExp = new RegExp( fillingCharSequence + '( )?', 'g' ),
+                isSelectingTable;
+        // #### table selection : START
+        // @param {CKEDITOR.dom.range[]} ranges
+        // @param {Boolean} allowPartially Whether a collapsed selection within table is recognized to be a valid selection.
+        // This happens for WebKits on MacOS, when you right click inside the table.
+        function isTableSelection( ranges, allowPartially ) {
+                if ( ranges.length === 0 ) {
+                        return false;
+                }
+                var node,
+                        i;
+                function isPartiallySelected( range ) {
+                        var startCell = range.startContainer.getAscendant( { td: 1, th: 1 }, true ),
+                                endCell = range.endContainer.getAscendant( { td: 1, th: 1 }, true ),
+                                trim = CKEDITOR.tools.trim,
+                                selected;
+                        // Check if the selection is inside one cell and we don't have any nested table contents selected.
+                        if ( !startCell || !startCell.equals( endCell ) || startCell.findOne( 'td, th, tr, tbody, table' ) ) {
+                                return false;
+                        }
+                        selected = range.cloneContents();
+                        // Empty selection is still partially selected.
+                        if ( !selected.getFirst() ) {
+                                return true;
+                        }
+                        return trim( selected.getFirst().getText() ) !== trim( startCell.getText() );
+                }
+                // Edge case: partially selected text node inside one table cell or cursor inside cell.
+                if ( !allowPartially && ranges.length === 1 &&
+                        ( ranges[ 0 ].collapsed || isPartiallySelected( ranges[ 0 ] ) ) ) {
+                        return false;
+                }
+                for ( i = 0; i < ranges.length; i++ ) {
+                        node = ranges[ i ]._getTableElement();
+                        if ( !node ) {
+                                return false;
+                        }
+                }
+                return true;
+        }
+        // After performing fake table selection, the real selection is limited
+        // to the first selected cell. Therefore to check if the real selection
+        // matches the fake selection, we check if the table cell from fake selection's
+        // first range and real selection's range are the same.
+        // Also if the selection is collapsed, we should check if it's placed inside the table
+        // in which the fake selection is or inside nested table. Such selection occurs after right mouse click.
+        function isRealTableSelection( selection, fakeSelection ) {
+                var ranges = selection.getRanges(),
+                        fakeRanges = fakeSelection.getRanges(),
+                        table = ranges.length && ranges[ 0 ]._getTableElement() &&
+                                ranges[ 0 ]._getTableElement().getAscendant( 'table', true ),
+                        fakeTable = fakeRanges.length && fakeRanges[ 0 ]._getTableElement() &&
+                                fakeRanges[ 0 ]._getTableElement().getAscendant( 'table', true ),
+                        isTableRange = ranges.length === 1 && ranges[ 0 ]._getTableElement() &&
+                                        ranges[ 0 ]._getTableElement().is( 'table' ),
+                        isFakeTableRange = fakeRanges.length === 1 && fakeRanges[ 0 ]._getTableElement() &&
+                                        fakeRanges[ 0 ]._getTableElement().is( 'table' );
+                function isValidTableSelection( table, fakeTable, ranges, fakeRanges ) {
+                        var isMenuOpen = ranges.length === 1 && ranges[ 0 ].collapsed,
+                                // In case of WebKit on MacOS, when checking real selection, we must allow selection to be partial.
+                                // Otherwise the check will fail for table selection with opened context menu.
+                                isInTable = isTableSelection( ranges, !!CKEDITOR.env.webkit ) && isTableSelection( fakeRanges );
+                        return isSameTable( table, fakeTable ) && ( isMenuOpen || isInTable );
+                }
+                function isSameTable( table, fakeTable ) {
+                        if ( !table || !fakeTable ) {
+                                return false;
+                        }
+                        return table.equals( fakeTable ) || fakeTable.contains( table );
+                }
+                if ( isValidTableSelection( table, fakeTable, ranges, fakeRanges ) ) {
+                        // Edge case: when editor contains only table and that table is selected using selectAll command,
+                        // then the selection is not properly refreshed and it must be done manually.
+                        if ( isTableRange && !isFakeTableRange ) {
+                                fakeSelection.selectRanges( ranges );
+                        }
+                        return true;
+                }
+                return false;
+        }
+        function getSelectedCells( ranges ) {
+                var cells = [],
+                        node,
+                        i;
+                function getCellsFromElement( element ) {
+                        var cells = element.find( 'td, th' ),
+                                cellsArray = [],
+                                i;
+                        for ( i = 0; i < cells.count(); i++ ) {
+                                cellsArray.push( cells.getItem( i ) );
+                        }
+                        return cellsArray;
+                }
+                for ( i = 0; i < ranges.length; i++ ) {
+                        node = ranges[ i ]._getTableElement();
+                        if ( node.is && node.is( { td: 1, th: 1 } ) ) {
+                                cells.push( node );
+                        } else {
+                                cells = cells.concat( getCellsFromElement( node ) );
+                        }
+                }
+                return cells;
+        }
+        // Cells in the same row are separated by tab and the rows are separated by new line, e.g.
+        // Cell 1.1     Cell 1.2
+        // Cell 2.1     Cell 2.2
+        function getTextFromSelectedCells( ranges ) {
+                var cells = getSelectedCells( ranges ),
+                        txt = '',
+                        currentRow = [],
+                        lastRow,
+                        i;
+                for ( i = 0; i < cells.length; i++ ) {
+                        if ( lastRow && !lastRow.equals( cells[ i ].getAscendant( 'tr' ) ) ) {
+                                txt += currentRow.join( '\t' ) + '\n';
+                                lastRow = cells[ i ].getAscendant( 'tr' );
+                                currentRow = [];
+                        } else if ( i === 0 ) {
+                                lastRow = cells[ i ].getAscendant( 'tr' );
+                        }
+                        currentRow.push( cells[ i ].getText() );
+                }
+                txt += currentRow.join( '\t' );
+                return txt;
+        }
+        function performFakeTableSelection( ranges ) {
+                var editor = this.root.editor,
+                        realSelection = editor.getSelection( 1 ),
+                        cache;
+                // Cleanup after previous selection - e.g. remove hidden sel container.
+                this.reset();
+                // Indicate that the table is being fake-selected to prevent infinite loop
+                // inside `selectRanges`.
+                isSelectingTable = true;
+                // Cancel selectionchange for the real selection.
+                realSelection.root.once( 'selectionchange', function( evt ) {
+                        evt.cancel();
+                }, null, null, 0 );
+                // Move real selection to the first selected range.
+                realSelection.selectRanges( [ ranges[ 0 ] ] );
+                cache = this._.cache;
+                // Caches given ranges.
+                cache.ranges = new CKEDITOR.dom.rangeList( ranges );
+                cache.type = CKEDITOR.SELECTION_TEXT;
+                cache.selectedElement = ranges[ 0 ]._getTableElement();
+                // `selectedText` should contain text from all selected data ("plain text table")
+                // to be compatible with Firefox's implementation.
+                cache.selectedText = getTextFromSelectedCells( ranges );
+                // Properties that will not be available when isFake.
+                cache.nativeSel = null;
+                this.isFake = 1;
+                this.rev = nextRev++;
+                // Save this selection, so it can be returned by editor.getSelection().
+                editor._.fakeSelection = this;
+                isSelectingTable = false;
+                // Fire selectionchange, just like a normal selection.
+                this.root.fire( 'selectionchange' );
+        }
+        // #### table selection : END
        // #### checkSelectionChange : START
        // The selection change check basically saves the element parent tree of
@@ -16,10 +224,9 @@
                if ( sel ) {
                        realSel = this.getSelection( 1 );
+                        // If real (not locked/stored) selection was moved from hidden container
-                        // If real (not locked/stored) selection was moved from hidden container,
+                        // or is not a table one, then the fake-selection must be invalidated.
-                        // then the fake-selection must be invalidated.
+                        if ( !realSel || ( !realSel.isHidden() && !isRealTableSelection( realSel, sel ) ) ) {
-                        if ( !realSel || !realSel.isHidden() ) {
                                // Remove the cache from fake-selection references in use elsewhere.
                                sel.reset();
@@ -41,8 +248,10 @@
                var currentPath = this.elementPath();
                if ( !currentPath.compare( this._.selectionPreviousPath ) ) {
+                        // Handle case when dialog inserts new element but parent block and path (so also focus context) does not change. (http://dev.ckeditor.com/ticket/13362)
+                        var sameBlockParent = this._.selectionPreviousPath && this._.selectionPreviousPath.blockLimit.equals( currentPath.blockLimit );
                        // Cache the active element, which we'll eventually lose on Webkit.
-                        if ( CKEDITOR.env.webkit )
+                        if ( CKEDITOR.env.webkit && !sameBlockParent )
                                this._.previousActive = this.document.getActive();
                        this._.selectionPreviousPath = currentPath;
@@ -89,7 +298,7 @@
        // * is a visible node,
        // * is a non-empty element (this rule will accept elements like <strong></strong> because they
        //      they were not accepted by the isVisible() check, not not <br> which cannot absorb the caret).
-        //      See #12621.
+        //      See http://dev.ckeditor.com/ticket/12621.
        function mayAbsorbCaret( node ) {
                if ( isVisible( node ) )
                        return true;
@@ -130,8 +339,8 @@
                if ( ctxRequiresFix( previous ) || ctxRequiresFix( next, 1 ) )
                        return true;
-                // Empty block/inline element is also affected. <span>^</span>, <p>^</p> (#7222)
+                // Empty block/inline element is also affected. <span>^</span>, <p>^</p> (http://dev.ckeditor.com/ticket/7222)
-                // If you found this line confusing check #12655.
+                // If you found this line confusing check http://dev.ckeditor.com/ticket/12655.
                if ( !( previous || next ) && !( ct.type == CKEDITOR.NODE_ELEMENT && ct.isBlockBoundary() && ct.getBogus() ) )
                        return true;
@@ -147,7 +356,7 @@
                return fillingChar;
        }
-        // Checks if a filling char has been used, eventualy removing it (#1272).
+        // Checks if a filling char has been used, eventually removing it (http://dev.ckeditor.com/ticket/1272).
        function checkFillingCharSequenceNodeReady( editable ) {
                var fillingChar = editable.getCustomData( 'cke-fillingChar' );
@@ -156,6 +365,7 @@
                        // creating it.
                        if ( fillingChar.getCustomData( 'ready' ) ) {
                                removeFillingCharSequenceNode( editable );
+                                editable.editor.fire( 'selectionCheck' );
                        } else {
                                fillingChar.setCustomData( 'ready', 1 );
                        }
@@ -167,7 +377,7 @@
                if ( fillingChar ) {
                        // Text selection position might get mangled by
-                        // subsequent dom modification, save it now for restoring. (#8617)
+                        // subsequent dom modification, save it now for restoring. (http://dev.ckeditor.com/ticket/8617)
                        if ( keepSelection !== false ) {
                                var sel = editable.getDocument().getSelection().getNative(),
                                        // Be error proof.
@@ -203,11 +413,11 @@
                }
        }
-        // #13816
+        // http://dev.ckeditor.com/ticket/13816
        function removeFillingCharSequenceString( str, nbspAware ) {
                if ( nbspAware ) {
                        return str.replace( fillingCharSequenceRegExp, function( m, p ) {
-                                // #10291 if filling char is followed by a space replace it with NBSP.
+                                // http://dev.ckeditor.com/ticket/10291 if filling char is followed by a space replace it with NBSP.
                                return p ? '\xa0' : '';
                        } );
                } else {
@@ -234,10 +444,11 @@
        }
        // Creates cke_hidden_sel container and puts real selection there.
-        function hideSelection( editor ) {
+        function hideSelection( editor, ariaLabel ) {
-                var style = CKEDITOR.env.ie ? 'display:none' : 'position:fixed;top:0;left:-1000px',
+                var content = ariaLabel || '&nbsp;',
+                        style = CKEDITOR.env.ie && CKEDITOR.env.version < 14 ? 'display:none' : 'position:fixed;top:0;left:-1000px',
                        hiddenEl = CKEDITOR.dom.element.createFromHtml(
-                                '<div data-cke-hidden-sel="1" data-cke-temp="1" style="' + style + '">&nbsp;</div>',
+                                '<div data-cke-hidden-sel="1" data-cke-temp="1" style="' + style + '">' + content + '</div>',
                                editor.document );
                editor.fire( 'lockSnapshot' );
@@ -382,7 +593,7 @@
                        ( enclosedNode = range.getEnclosedNode() ) && enclosedNode.type == CKEDITOR.NODE_ELEMENT ) {
                        // So far we can't say that enclosed element is non-editable. Before checking,
                        // we'll shrink range (clone). Shrinking will stop on non-editable range, or
-                        // innermost element (#11114).
+                        // innermost element (http://dev.ckeditor.com/ticket/11114).
                        clone = range.clone();
                        clone.shrink( CKEDITOR.SHRINK_ELEMENT, true );
@@ -516,7 +727,7 @@
                        // Give the editable an initial selection on first focus,
                        // put selection at a consistent position at the start
-                        // of the contents. (#9507)
+                        // of the contents. (http://dev.ckeditor.com/ticket/9507)
                        if ( CKEDITOR.env.gecko ) {
                                editable.attachListener( editable, 'focus', function( evt ) {
                                        evt.removeListener();
@@ -524,7 +735,7 @@
                                        if ( restoreSel !== 0 ) {
                                                var nativ = editor.getSelection().getNative();
                                                // Do it only if the native selection is at an unwanted
-                                                // place (at the very start of the editable). #10119
+                                                // place (at the very start of the editable). http://dev.ckeditor.com/ticket/10119
                                                if ( nativ && nativ.isCollapsed && nativ.anchorNode == editable.$ ) {
                                                        var rng = editor.createRange();
                                                        rng.moveToElementEditStart( editable );
@@ -539,9 +750,17 @@
                                // On Webkit we use DOMFocusIn which is fired more often than focus - e.g. when moving from main editable
                                // to nested editable (or the opposite). Unlock selection all, but restore only when it was locked
                                // for the same active element, what will e.g. mean restoring after displaying dialog.
-                                if ( restoreSel && CKEDITOR.env.webkit )
+                                if ( restoreSel && CKEDITOR.env.webkit ) {
                                        restoreSel = editor._.previousActive && editor._.previousActive.equals( doc.getActive() );
+                                        // On Webkit when editor uses divarea, native focus causes editable viewport to scroll
+                                        // to the top (when there is no active selection inside while focusing) so the scroll
+                                        // position should be restored after focusing back editable area. (http://dev.ckeditor.com/ticket/14659)
+                                        if ( restoreSel && editor._.previousScrollTop != null && editor._.previousScrollTop != editable.$.scrollTop ) {
+                                                editable.$.scrollTop = editor._.previousScrollTop;
+                                        }
+                                }
                                editor.unlockSelection( restoreSel );
                                restoreSel = 0;
                        }, null, null, -1 );
@@ -588,7 +807,7 @@
                                editable.attachListener( editable, 'mousedown', function( evt ) {
                                        // IE scrolls document to top on right mousedown
                                        // when editor has no focus, remember this scroll
-                                        // position and revert it before context menu opens. (#5778)
+                                        // position and revert it before context menu opens. (http://dev.ckeditor.com/ticket/5778)
                                        if ( evt.data.$.button == 2 ) {
                                                var sel = editor.document.getSelection();
                                                if ( !sel || sel.getType() == CKEDITOR.SELECTION_NONE )
@@ -607,9 +826,12 @@
                                // When content doc is in standards mode, IE doesn't focus the editor when
                                // clicking at the region below body (on html element) content, we emulate
-                                // the normal behavior on old IEs. (#1659, #7932)
+                                // the normal behavior on old IEs. (http://dev.ckeditor.com/ticket/1659, http://dev.ckeditor.com/ticket/7932)
                                if ( doc.$.compatMode != 'BackCompat' ) {
                                        if ( CKEDITOR.env.ie7Compat || CKEDITOR.env.ie6Compat ) {
+                                                var textRng,
+                                                        startRng;
                                                html.on( 'mousedown', function( evt ) {
                                                        evt = evt.data;
@@ -641,7 +863,7 @@
                                                                html.removeListener( 'mousemove', onHover );
                                                                removeListeners();
-                                                                // Make it in effect on mouse up. (#9022)
+                                                                // Make it in effect on mouse up. (http://dev.ckeditor.com/ticket/9022)
                                                                textRng.select();
                                                        }
@@ -652,11 +874,11 @@
                                                                        evt.$.y < html.$.clientHeight &&
                                                                        evt.$.x < html.$.clientWidth ) {
                                                                // Start to build the text range.
-                                                                var textRng = body.$.createTextRange();
+                                                                textRng = body.$.createTextRange();
                                                                moveRangeToPoint( textRng, evt.$.clientX, evt.$.clientY );
                                                                // Records the dragging start of the above text range.
-                                                                var startRng = textRng.duplicate();
+                                                                startRng = textRng.duplicate();
                                                                html.on( 'mousemove', onHover );
                                                                outerDoc.on( 'mouseup', onSelectEnd );
@@ -670,7 +892,7 @@
                                        if ( CKEDITOR.env.version > 7 && CKEDITOR.env.version < 11 ) {
                                                html.on( 'mousedown', function( evt ) {
                                                        if ( evt.data.getTarget().is( 'html' ) ) {
-                                                                // Limit the text selection mouse move inside of editable. (#9715)
+                                                                // Limit the text selection mouse move inside of editable. (http://dev.ckeditor.com/ticket/9715)
                                                                outerDoc.on( 'mouseup', onSelectEnd );
                                                                html.on( 'mouseup', onSelectEnd );
                                                        }
@@ -684,6 +906,14 @@
                        // 2. After the accomplish of keyboard and mouse events.
                        editable.attachListener( editable, 'selectionchange', checkSelectionChange, editor );
                        editable.attachListener( editable, 'keyup', checkSelectionChangeTimeout, editor );
+                        // http://dev.ckeditor.com/ticket/14407 - Don't even let anything happen if the selection is in a non-editable element.
+                        editable.attachListener( editable, 'keydown', function( evt ) {
+                                var sel = this.getSelection( 1 );
+                                if ( nonEditableAscendant( sel ) ) {
+                                        sel.selectElement( nonEditableAscendant( sel ) );
+                                        evt.data.preventDefault();
+                                }
+                        }, editor );
                        // Always fire the selection change on focus gain.
                        // On Webkit do this on DOMFocusIn, because the selection is unlocked on it too and
                        // we need synchronization between those listeners to not lost cached editor._.previousActive property
@@ -693,7 +923,7 @@
                                editor.selectionChange( 1 );
                        } );
-                        // #9699: On Webkit&Gecko in inline editor we have to check selection when it was changed
+                        // http://dev.ckeditor.com/ticket/9699: On Webkit&Gecko in inline editor we have to check selection when it was changed
                        // by dragging and releasing mouse button outside editable. Dragging (mousedown)
                        // has to be initialized in editable, but for mouseup we listen on document element.
                        if ( isInline && ( CKEDITOR.env.webkit || CKEDITOR.env.gecko ) ) {
@@ -707,11 +937,11 @@
                                        mouseDown = 0;
                                } );
                        }
-                        // In all other cases listen on simple mouseup over editable, as we did before #9699.
+                        // In all other cases listen on simple mouseup over editable, as we did before http://dev.ckeditor.com/ticket/9699.
                        //
                        // Use document instead of editable in non-IEs for observing mouseup
                        // since editable won't fire the event if selection process started within iframe and ended out
-                        // of the editor (#9851).
+                        // of the editor (http://dev.ckeditor.com/ticket/9851).
                        else {
                                editable.attachListener( CKEDITOR.env.ie ? editable : doc.getDocumentElement(), 'mouseup', checkSelectionChangeTimeout, editor );
                        }
@@ -733,18 +963,18 @@
                                                case 8: // BACKSPACE
                                                case 45: // INS
                                                case 46: // DEl
-                                                        removeFillingCharSequenceNode( editable );
+                                                        if ( editable.hasFocus ) {
+                                                                removeFillingCharSequenceNode( editable );
+                                                        }
                                        }
                                }, null, null, -1 );
                        }
-                        // Automatically select non-editable element when navigating into
-                        // it by left/right or backspace/del keys.
                        editable.attachListener( editable, 'keydown', getOnKeyDownListener( editor ), null, null, -1 );
                        function moveRangeToPoint( range, x, y ) {
-                                // Error prune in IE7. (#9034, #9110)
+                                // Error prune in IE7. (http://dev.ckeditor.com/ticket/9034, http://dev.ckeditor.com/ticket/9110)
                                try {
                                        range.moveToPoint( x, y );
                                } catch ( e ) {}
@@ -765,14 +995,27 @@
                                        range = sel.createRange();
                                // The selection range is reported on host, but actually it should applies to the content doc.
-                                if ( sel.type != 'None' && range.parentElement().ownerDocument == doc.$ )
+                                // The parentElement may be null for read only mode in IE10 and below (http://dev.ckeditor.com/ticket/9780).
+                                if ( sel.type != 'None' && range.parentElement() && range.parentElement().ownerDocument == doc.$ )
                                        range.select();
                        }
+                        function nonEditableAscendant( sel ) {
+                                if ( CKEDITOR.env.ie ) {
+                                        var range = sel.getRanges()[ 0 ],
+                                                ascendant = range ? range.startContainer.getAscendant( function( parent ) {
+                                                                return parent.type == CKEDITOR.NODE_ELEMENT &&
+                                                                        ( parent.getAttribute( 'contenteditable' ) == 'false' || parent.getAttribute( 'contenteditable' ) == 'true' );
+                                                        }, true ) : null ;
+                                        return range && ascendant.getAttribute( 'contenteditable' ) == 'false' && ascendant;
+                                }
+                        }
                } );
                editor.on( 'setData', function() {
                        // Invalidate locked selection when unloading DOM.
-                        // (#9521, #5217#comment:32 and #11500#comment:11)
+                        // (http://dev.ckeditor.com/ticket/9521, http://dev.ckeditor.com/ticket/5217#comment:32 and http://dev.ckeditor.com/ticket/11500#comment:11)
                        editor.unlockSelection();
                        // Webkit's selection will mess up after the data loading.
@@ -786,7 +1029,7 @@
                        editor.unlockSelection();
                } );
-                // IE9 might cease to work if there's an object selection inside the iframe (#7639).
+                // IE9 might cease to work if there's an object selection inside the iframe (http://dev.ckeditor.com/ticket/7639).
                if ( CKEDITOR.env.ie9Compat )
                        editor.on( 'beforeDestroy', clearSelection, null, null, 9 );
@@ -802,7 +1045,7 @@
                // When loaded data are ready check whether hidden selection container was not loaded.
                editor.on( 'loadSnapshot', function() {
                        var isElement = CKEDITOR.dom.walker.nodeType( CKEDITOR.NODE_ELEMENT ),
-                                // TODO replace with el.find() which will be introduced in #9764,
+                                // TODO replace with el.find() which will be introduced in http://dev.ckeditor.com/ticket/9764,
                                // because it may happen that hidden sel container won't be the last element.
                                last = editor.editable().getLast( isElement );
@@ -849,7 +1092,7 @@
        } );
        // On WebKit only, we need a special "filling" char on some situations
-        // (#1272). Here we set the events that should invalidate that char.
+        // (http://dev.ckeditor.com/ticket/1272). Here we set the events that should invalidate that char.
        if ( CKEDITOR.env.webkit ) {
                CKEDITOR.on( 'instanceReady', function( evt ) {
                        var editor = evt.editor;
@@ -864,7 +1107,7 @@
                        // Filter Undo snapshot's HTML to get rid of Filling Char Sequence.
                        // Note: CKEDITOR.dom.range.createBookmark2() normalizes snapshot's
-                        // bookmarks to anticipate the removal of FCSeq from the snapshot's HTML (#13816).
+                        // bookmarks to anticipate the removal of FCSeq from the snapshot's HTML (http://dev.ckeditor.com/ticket/13816).
                        editor.on( 'getSnapshot', function( evt ) {
                                if ( evt.data ) {
                                        evt.data = removeFillingCharSequenceString( evt.data );
@@ -873,7 +1116,7 @@
                        // Filter data to get rid of Filling Char Sequence. Filter on #toDataFormat
                        // instead of #getData because once removed, FCSeq may leave an empty element,
-                        // which should be pruned by the dataProcessor (#13816).
+                        // which should be pruned by the dataProcessor (http://dev.ckeditor.com/ticket/13816).
                        // Note: Used low priority to filter when dataProcessor works on strings,
                        // not pseudo–DOM.
                        editor.on( 'toDataFormat', function( evt ) {
@@ -1039,9 +1282,6 @@
         */
        CKEDITOR.SELECTION_ELEMENT = 3;
-        var isMSSelection = typeof window.getSelection != 'function',
-                nextRev = 1;
        /**
         * Manipulates the selection within a DOM element. If the current browser selection
         * spans outside of the element, an empty selection object is returned.
@@ -1121,7 +1361,7 @@
                // Selection out of concerned range, empty the selection.
                // TODO check whether this condition cannot be reverted to its old
-                // form (commented out) after we closed #10438.
+                // form (commented out) after we closed http://dev.ckeditor.com/ticket/10438.
                //if ( !( rangeParent && ( root.equals( rangeParent ) || root.contains( rangeParent ) ) ) ) {
                if ( !(
                        rangeParent &&
@@ -1142,10 +1382,6 @@
        var styleObjectElements = { img: 1, hr: 1, li: 1, table: 1, tr: 1, td: 1, th: 1, embed: 1, object: 1, ol: 1, ul: 1,
                        a: 1, input: 1, form: 1, select: 1, textarea: 1, button: 1, fieldset: 1, thead: 1, tfoot: 1 };
-        // #13816
-        var fillingCharSequence = CKEDITOR.tools.repeat( '\u200b', 7 ),
-                fillingCharSequenceRegExp = new RegExp( fillingCharSequence + '( )?', 'g' );
        CKEDITOR.tools.extend( CKEDITOR.dom.selection, {
                _removeFillingCharSequenceString: removeFillingCharSequenceString,
                _createFillingCharSequenceNode: createFillingCharSequenceNode,
@@ -1167,7 +1403,7 @@
                 *
                 *              var selection = editor.getSelection().getNative();
                 *
-                 * @returns {Object} The native browser selection object.
+                 * @returns {Object} The native browser selection object or null if this is a fake selection.
                 */
                getNative: function() {
                        if ( this._.cache.nativeSel !== undefined )
@@ -1259,7 +1495,7 @@
                 *              alert( ranges.length );
                 *
                 * @method
-                 * @param {Boolean} [onlyEditables] If set to `true`, this function retrives editable ranges only.
+                 * @param {Boolean} [onlyEditables] If set to `true`, this function retrieves editable ranges only.
                 * @returns {Array} Range instances that represent the current selection.
                 */
                getRanges: ( function() {
@@ -1290,7 +1526,7 @@
                                                index = -1,
                                                position, distance, container;
-                                        // Binary search over all element childs to test the range to see whether
+                                        // Binary search over all element children to test the range to see whether
                                        // range is right on the boundary of one element.
                                        while ( startIndex <= endIndex ) {
                                                index = Math.floor( ( startIndex + endIndex ) / 2 );
@@ -1306,8 +1542,8 @@
                                                        return { container: parent, offset: getNodeIndex( child ) };
                                        }
-                                        // All childs are text nodes,
+                                        // All children are text nodes,
-                                        // or to the right hand of test range are all text nodes. (#6992)
+                                        // or to the right hand of test range are all text nodes. (http://dev.ckeditor.com/ticket/6992)
                                        if ( index == -1 || index == siblings.length - 1 && position < 0 ) {
                                                // Adapt test range to embrace the entire parent contents.
                                                testRange.moveToElementText( parent );
@@ -1315,7 +1551,7 @@
                                                // IE report line break as CRLF with range.text but
                                                // only LF with textnode.nodeValue, normalize them to avoid
-                                                // breaking character counting logic below. (#3949)
+                                                // breaking character counting logic below. (http://dev.ckeditor.com/ticket/3949)
                                                distance = testRange.text.replace( /(\r\n|\r)/g, '\n' ).length;
                                                siblings = parent.childNodes;
@@ -1351,7 +1587,7 @@
                                                // IE report line break as CRLF with range.text but
                                                // only LF with textnode.nodeValue, normalize them to avoid
-                                                // breaking character counting logic below. (#3949)
+                                                // breaking character counting logic below. (http://dev.ckeditor.com/ticket/3949)
                                                distance = testRange.text.replace( /(\r\n|\r)/g, '\n' ).length;
                                                // Actual range anchor right beside test range at the inner boundary of text node.
@@ -1368,7 +1604,7 @@
                                                                }
                                                                child = sibling;
                                                        }
-                                                        // Measurement in IE could be somtimes wrong because of <select> element. (#4611)
+                                                        // Measurement in IE could be sometimes wrong because of <select> element. (http://dev.ckeditor.com/ticket/4611)
                                                        catch ( e ) {
                                                                return { container: parent, offset: getNodeIndex( child ) };
                                                        }
@@ -1400,7 +1636,7 @@
                                                boundaryInfo = getBoundaryInformation( nativeRange );
                                                range.setEnd( new CKEDITOR.dom.node( boundaryInfo.container ), boundaryInfo.offset );
-                                                // Correct an invalid IE range case on empty list item. (#5850)
+                                                // Correct an invalid IE range case on empty list item. (http://dev.ckeditor.com/ticket/5850)
                                                if ( range.endContainer.getPosition( range.startContainer ) & CKEDITOR.POSITION_PRECEDING && range.endOffset <= range.startContainer.getIndex() )
                                                        range.collapse();
@@ -1432,7 +1668,7 @@
                        } )() :
                        function() {
                                // On browsers implementing the W3C range, we simply
-                                // tranform the native ranges in CKEDITOR.dom.range
+                                // transform the native ranges in CKEDITOR.dom.range
                                // instances.
                                var ranges = [],
@@ -1465,7 +1701,7 @@
                                        return ranges;
                                // Split range into multiple by read-only nodes.
-                                // Clone ranges array to avoid changing cached ranges (#11493).
+                                // Clone ranges array to avoid changing cached ranges (http://dev.ckeditor.com/ticket/11493).
                                return extractEditableRanges( new CKEDITOR.dom.rangeList( ranges.slice() ) );
                        };
                } )(),
@@ -1499,11 +1735,11 @@
                                                        // Decrease the range content to exclude particial
                                                        // selected node on the start which doesn't have
-                                                        // visual impact. ( #3231 )
+                                                        // visual impact. ( http://dev.ckeditor.com/ticket/3231 )
                                                        while ( 1 ) {
                                                                var startContainer = range.startContainer,
                                                                        startOffset = range.startOffset;
-                                                                // Limit the fix only to non-block elements.(#3950)
+                                                                // Limit the fix only to non-block elements.(http://dev.ckeditor.com/ticket/3950)
                                                                if ( startOffset == ( startContainer.getChildCount ? startContainer.getChildCount() : startContainer.getLength() ) && !startContainer.isBlockBoundary() )
                                                                        range.setStartAfter( startContainer );
                                                                else
@@ -1545,7 +1781,7 @@
                 *              var element = editor.getSelection().getSelectedElement();
                 *              alert( element.getName() );
                 *
-                 * @returns {CKEDITOR.dom.element} The selected element. Null if no
+                 * @returns {CKEDITOR.dom.element/null} The selected element. `null` if no
                 * selection is available or the selection type is not {@link CKEDITOR#SELECTION_ELEMENT}.
                 */
                getSelectedElement: function() {
@@ -1628,7 +1864,7 @@
                        if ( restore ) {
                                var selectedElement = this.getSelectedElement(),
-                                        ranges = !selectedElement && this.getRanges(),
+                                        ranges = this.getRanges(),
                                        faked = this.isFake;
                        }
@@ -1642,7 +1878,10 @@
                                if ( !( common && common.getAscendant( 'body', 1 ) ) )
                                        return;
-                                if ( faked )
+                                if ( isTableSelection( ranges ) ) {
+                                        // Tables have it's own selection method.
+                                        performFakeTableSelection.call( this, ranges );
+                                } else if ( faked )
                                        this.fake( selectedElement );
                                else if ( selectedElement )
                                        this.selectElement( selectedElement );
@@ -1714,7 +1953,7 @@
                        // Check if there's a hiddenSelectionContainer in editable at some index.
                        // Some ranges may be anchored after the hiddenSelectionContainer and,
                        // once the container is removed while resetting the selection, they
-                        // may need new endOffset (one element less within the range) (#11021 #11393).
+                        // may need new endOffset (one element less within the range) (http://dev.ckeditor.com/ticket/11021 http://dev.ckeditor.com/ticket/11393).
                        if ( hadHiddenSelectionContainer )
                                fixRangesAfterHiddenSelectionContainer( ranges, this.root );
@@ -1742,6 +1981,15 @@
                                return;
                        }
+                        // Handle special case - fake selection of table cells.
+                        if ( editor && editor.plugins.tableselection &&
+                                CKEDITOR.plugins.tableselection.isSupportedEnvironment &&
+                                isTableSelection( ranges ) && !isSelectingTable
+                        ) {
+                                performFakeTableSelection.call( this, ranges );
+                                return;
+                        }
                        if ( isMSSelection ) {
                                var notWhitespaces = CKEDITOR.dom.walker.whitespaces( true ),
                                        fillerTextRegex = /\ufeff|\u00a0/,
@@ -1775,7 +2023,7 @@
                                if ( range.startContainer.type == CKEDITOR.NODE_ELEMENT && range.startContainer.getName() in nonCells ||
                                        range.endContainer.type == CKEDITOR.NODE_ELEMENT && range.endContainer.getName() in nonCells ) {
                                        range.shrink( CKEDITOR.NODE_ELEMENT, true );
-                                        // The range might get collapsed (#7975). Update cached variable.
+                                        // The range might get collapsed (http://dev.ckeditor.com/ticket/7975). Update cached variable.
                                        collapsed = range.collapsed;
                                }
@@ -1817,18 +2065,18 @@
                                        // Append a temporary <span>&#65279;</span> before the selection.
                                        // This is needed to avoid IE destroying selections inside empty
-                                        // inline elements, like <b></b> (#253).
+                                        // inline elements, like <b></b> (http://dev.ckeditor.com/ticket/253).
                                        // It is also needed when placing the selection right after an inline
                                        // element to avoid the selection moving inside of it.
                                        dummySpan = range.document.createElement( 'span' );
-                                        dummySpan.setHtml( '&#65279;' ); // Zero Width No-Break Space (U+FEFF). See #1359.
+                                        dummySpan.setHtml( '&#65279;' ); // Zero Width No-Break Space (U+FEFF). See http://dev.ckeditor.com/ticket/1359.
                                        dummySpan.insertBefore( startNode );
                                        if ( isStartMarkerAlone ) {
                                                // To expand empty blocks or line spaces after <br>, we need
                                                // instead to have any char, which will be later deleted using the
                                                // selection.
-                                                // \ufeff = Zero Width No-Break Space (U+FEFF). (#1359)
+                                                // \ufeff = Zero Width No-Break Space (U+FEFF). (http://dev.ckeditor.com/ticket/1359)
                                                range.document.createText( '\ufeff' ).insertBefore( startNode );
                                        }
                                }
@@ -1860,7 +2108,7 @@
                        } else {
                                var sel = this.getNative();
-                                // getNative() returns null if iframe is "display:none" in FF. (#6577)
+                                // getNative() returns null if iframe is "display:none" in FF. (http://dev.ckeditor.com/ticket/6577)
                                if ( !sel )
                                        return;
@@ -1876,7 +2124,7 @@
                                                between.setStart( left.endContainer, left.endOffset );
                                                between.setEnd( right.startContainer, right.startOffset );
-                                                // Don't confused by Firefox adjancent multi-ranges
+                                                // Don't confused by Firefox adjacent multi-ranges
                                                // introduced by table cells selection.
                                                if ( !between.collapsed ) {
                                                        between.shrink( CKEDITOR.NODE_ELEMENT, true );
@@ -1885,7 +2133,7 @@
                                                        // The following cases has to be considered:
                                                        // 1. <span contenteditable="false">[placeholder]</span>
-                                                        // 2. <input contenteditable="false"  type="radio"/> (#6621)
+                                                        // 2. <input contenteditable="false"  type="radio"/> (http://dev.ckeditor.com/ticket/6621)
                                                        if ( ancestor.isReadOnly() || enclosed && enclosed.isReadOnly() ) {
                                                                right.setStart( left.startContainer, left.startOffset );
                                                                ranges.splice( i--, 1 );
@@ -1900,7 +2148,7 @@
                                        if ( range.collapsed && CKEDITOR.env.webkit && rangeRequiresFix( range ) ) {
                                                // Append a zero-width space so WebKit will not try to
-                                                // move the selection by itself (#1272).
+                                                // move the selection by itself (http://dev.ckeditor.com/ticket/1272).
                                                var fillingChar = createFillingCharSequenceNode( this.root );
                                                range.insertNode( fillingChar );
@@ -1954,14 +2202,20 @@
                 * displayed to the user.
                 *
                 * @param {CKEDITOR.dom.element} element The element to be "selected".
+                 * @param {String} [ariaLabel] A string to be used by the screen reader to describe the selection.
                 */
-                fake: function( element ) {
+                fake: function( element, ariaLabel ) {
                        var editor = this.root.editor;
+                        // Attempt to retrieve aria-label if possible (http://dev.ckeditor.com/ticket/14539).
+                        if ( ariaLabel === undefined && element.hasAttribute( 'aria-label' ) ) {
+                                ariaLabel = element.getAttribute( 'aria-label' );
+                        }
                        // Cleanup after previous selection - e.g. remove hidden sel container.
                        this.reset();
-                        hideSelection( editor );
+                        hideSelection( editor, ariaLabel );
                        // Set this value after executing hiseSelection, because it may
                        // cause reset() which overwrites cache.
@@ -2012,6 +2266,38 @@
                },
                /**
+                 * Checks if the selection contains an HTML element inside a table.
+                 * Returns `false` for text selection inside a table (e.g. it will return `false`
+                 * for text selected in one cell).
+                 *
+                 *              editor.getSelection().isInTable();
+                 *
+                 * @since 4.7.0
+                 * @param {Boolean} [allowPartialSelection=false] Whether a partial cell selection should be included.
+                 * Added in 4.7.2.
+                 * @returns {Boolean}
+                 */
+                isInTable: function( allowPartialSelection ) {
+                        return isTableSelection( this.getRanges(), allowPartialSelection );
+                },
+                /**
+                 * Checks if the selection contains only one range which is collapsed.
+                 *
+                 *              if ( editor.getSelection().isCollapsed() ) {
+                 *                      // Do something when the selection is collapsed.
+                 *              }
+                 *
+                 * @since 4.7.3
+                 * @returns {Boolean}
+                 */
+                isCollapsed: function() {
+                        var ranges = this.getRanges();
+                        return ranges.length === 1 && ranges[ 0 ].collapsed;
+                },
+                /**
                 * Creates a bookmark for each range of this selection (from {@link #getRanges})
                 * by calling the {@link CKEDITOR.dom.range#createBookmark} method,
                 * with extra care taken to avoid interference among those ranges. The arguments
@@ -2064,17 +2350,19 @@
                        // It may happen that the content change during loading, before selection is set so bookmark leads to text node.
                        if ( bookmarks.isFake ) {
-                                node = ranges[ 0 ].getEnclosedNode();
+                                node = isTableSelection( ranges ) ? ranges[ 0 ]._getTableElement() : ranges[ 0 ].getEnclosedNode();
                                if ( !node || node.type != CKEDITOR.NODE_ELEMENT ) {
                                        CKEDITOR.warn( 'selection-not-fake' );
                                        bookmarks.isFake = 0;
                                }
                        }
-                        if ( bookmarks.isFake )
+                        if ( bookmarks.isFake && !isTableSelection( ranges ) ) {
                                this.fake( node );
-                        else
+                        } else {
                                this.selectRanges( ranges );
+                        }
                        return this;
                },
@@ -2111,7 +2399,7 @@
                 * Remove all the selection ranges from the document.
                 */
                removeAllRanges: function() {
-                        // Don't clear selection outside this selection's root (#11500).
+                        // Don't clear selection outside this selection's root (http://dev.ckeditor.com/ticket/11500).
                        if ( this.getType() == CKEDITOR.SELECTION_NONE )
                                return;
diff --git a/sources/core/skin.js b/sources/core/skin.js
index 98b8536..290157d 100644
--- a/sources/core/skin.js
+++ b/sources/core/skin.js
@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 * For licensing, see LICENSE.md or http://ckeditor.com/license
 */
@@ -125,7 +125,7 @@
                        offset = overrideOffset || ( icon && icon.offset );
                        bgsize = overrideBgsize || ( icon && icon.bgsize ) || '16px';
-                        // If we use apostrophes in background-image, we must escape apostrophes in path (just to be sure). (#13361)
+                        // If we use apostrophes in background-image, we must escape apostrophes in path (just to be sure). (http://dev.ckeditor.com/ticket/13361)
                        if ( path )
                                path = path.replace( /'/g, '\\\'' );
diff --git a/sources/core/style.js b/sources/core/style.js
index 09b117b..b3cf0bc 100644
--- a/sources/core/style.js
+++ b/sources/core/style.js
@@ -1,5 +1,5 @@
-/**
+/**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 * For licensing, see LICENSE.md or http://ckeditor.com/license
 */
@@ -235,7 +235,7 @@ CKEDITOR.STYLE_OBJECT = 3;
                                var initialEnterMode = this._.enterMode;
                                // Before CKEditor 4.4 style knew nothing about editor, so in order to provide enterMode
-                                // which should be used developers were forced to hack the style object (see #10190).
+                                // which should be used developers were forced to hack the style object (see http://dev.ckeditor.com/ticket/10190).
                                // Since CKEditor 4.4 style knows about editor (at least when it's being applied/removed), but we
                                // use _.enterMode for backward compatibility with those hacks.
                                // Note: we should not change style's enter mode if it was already set.
@@ -569,7 +569,7 @@ CKEDITOR.STYLE_OBJECT = 3;
                        var styleVal = stylesDef[ style ],
                                text = ( style + ':' + styleVal ).replace( semicolonFixRegex, ';' );
-                        // Some browsers don't support 'inherit' property value, leave them intact. (#5242)
+                        // Some browsers don't support 'inherit' property value, leave them intact. (http://dev.ckeditor.com/ticket/5242)
                        if ( styleVal == 'inherit' )
                                specialStylesText += text;
                        else
@@ -1024,7 +1024,7 @@ CKEDITOR.STYLE_OBJECT = 3;
                                        if ( !CKEDITOR.env.ie )
                                                styleNode.$.normalize();
                                }
-                                // Style already inherit from parents, left just to clear up any internal overrides. (#5931)
+                                // Style already inherit from parents, left just to clear up any internal overrides. (http://dev.ckeditor.com/ticket/5931)
                                else {
                                        styleNode = new CKEDITOR.dom.element( 'span' );
                                        styleRange.extractContents().appendTo( styleNode );
@@ -1042,7 +1042,7 @@ CKEDITOR.STYLE_OBJECT = 3;
                // Remove the bookmark nodes.
                range.moveToBookmark( boundaryNodes );
-                // Minimize the result range to exclude empty text nodes. (#5374)
+                // Minimize the result range to exclude empty text nodes. (http://dev.ckeditor.com/ticket/5374)
                range.shrink( CKEDITOR.SHRINK_TEXT );
                // Get inside the remaining element if range.shrink( TEXT ) has failed because of non-editable elements inside.
@@ -1058,27 +1058,31 @@ CKEDITOR.STYLE_OBJECT = 3;
                range.enlarge( CKEDITOR.ENLARGE_INLINE, 1 );
                var bookmark = range.createBookmark(),
-                        startNode = bookmark.startNode;
+                        startNode = bookmark.startNode,
+                        alwaysRemoveElement = this._.definition.alwaysRemoveElement;
                if ( range.collapsed ) {
                        var startPath = new CKEDITOR.dom.elementPath( startNode.getParent(), range.root ),
-                                // The topmost element in elementspatch which we should jump out of.
+                                // The topmost element in elements path which we should jump out of.
                                boundaryElement;
                        for ( var i = 0, element; i < startPath.elements.length && ( element = startPath.elements[ i ] ); i++ ) {
                                // 1. If it's collaped inside text nodes, try to remove the style from the whole element.
                                //
                                // 2. Otherwise if it's collapsed on element boundaries, moving the selection
                                //  outside the styles instead of removing the whole tag,
-                                //  also make sure other inner styles were well preserverd.(#3309)
+                                //  also make sure other inner styles were well preserved.(http://dev.ckeditor.com/ticket/3309)
-                                if ( element == startPath.block || element == startPath.blockLimit )
+                                //
+                                // 3. Force removing the element even if it's an boundary element when alwaysRemoveElement is true.
+                                // Without it, the links won't be unlinked if the cursor is placed right before/after it. (http://dev.ckeditor.com/ticket/13062)
+                                if ( element == startPath.block || element == startPath.blockLimit ) {
                                        break;
+                                }
                                if ( this.checkElementRemovable( element ) ) {
                                        var isStart;
-                                        if ( range.collapsed && ( range.checkBoundaryOfElement( element, CKEDITOR.END ) || ( isStart = range.checkBoundaryOfElement( element, CKEDITOR.START ) ) ) ) {
+                                        if ( !alwaysRemoveElement && range.collapsed && ( range.checkBoundaryOfElement( element, CKEDITOR.END ) || ( isStart = range.checkBoundaryOfElement( element, CKEDITOR.START ) ) ) ) {
                                                boundaryElement = element;
                                                boundaryElement.match = isStart ? 'start' : 'end';
                                        } else {
@@ -1087,10 +1091,11 @@ CKEDITOR.STYLE_OBJECT = 3;
                                                // no difference that they're separate entities in the DOM tree. So, merge
                                                // them before removal.
                                                element.mergeSiblings();
-                                                if ( element.is( this.element ) )
+                                                if ( element.is( this.element ) ) {
                                                        removeFromElement.call( this, element );
-                                                else
+                                                } else {
                                                        removeOverrides( element, getOverrides( this )[ element.getName() ] );
+                                                }
                                        }
                                }
                        }
@@ -1235,7 +1240,7 @@ CKEDITOR.STYLE_OBJECT = 3;
        }
        function applyObjectStyle( range ) {
-                // Selected or parent element. (#9651)
+                // Selected or parent element. (http://dev.ckeditor.com/ticket/9651)
                var start = range.getEnclosedNode() || range.getCommonAncestor( false, true ),
                        element = new CKEDITOR.dom.elementPath( start, range.root ).contains( this.element, 1 );
@@ -1276,7 +1281,7 @@ CKEDITOR.STYLE_OBJECT = 3;
                var iterator = range.createIterator();
                iterator.enforceRealBlocks = true;
-                // make recognize <br /> tag as a separator in ENTER_BR mode (#5121)
+                // make recognize <br /> tag as a separator in ENTER_BR mode (http://dev.ckeditor.com/ticket/5121)
                if ( this._.enterMode )
                        iterator.enlargeBr = ( this._.enterMode != CKEDITOR.ENTER_BR );
@@ -1326,7 +1331,7 @@ CKEDITOR.STYLE_OBJECT = 3;
        // Replace the original block with new one, with special treatment
        // for <pre> blocks to make sure content format is well preserved, and merging/splitting adjacent
-        // when necessary. (#3188)
+        // when necessary. (http://dev.ckeditor.com/ticket/3188)
        function replaceBlock( block, newBlock ) {
                // Block is to be removed, create a temp element to
                // save contents.
@@ -1502,11 +1507,11 @@ CKEDITOR.STYLE_OBJECT = 3;
                // Remove definition attributes/style from the elemnt.
                for ( var attName in attributes ) {
-                        // The 'class' element value must match (#1318).
+                        // The 'class' element value must match (http://dev.ckeditor.com/ticket/1318).
                        if ( ( attName == 'class' || this._.definition.fullMatch ) && element.getAttribute( attName ) != normalizeProperty( attName, attributes[ attName ] ) )
                                continue;
-                        // Do not touch data-* attributes (#11011) (#11258).
+                        // Do not touch data-* attributes (http://dev.ckeditor.com/ticket/11011) (http://dev.ckeditor.com/ticket/11258).
                        if ( keepDataAttrs && attName.slice( 0, 5 ) == 'data-' )
                                continue;
@@ -1515,7 +1520,7 @@ CKEDITOR.STYLE_OBJECT = 3;
                }
                for ( var styleName in styles ) {
-                        // Full match style insist on having fully equivalence. (#5018)
+                        // Full match style insist on having fully equivalence. (http://dev.ckeditor.com/ticket/5018)
                        if ( this._.definition.fullMatch && element.getStyle( styleName ) != normalizeProperty( styleName, styles[ styleName ], true ) )
                                continue;
@@ -1649,7 +1654,7 @@ CKEDITOR.STYLE_OBJECT = 3;
                // Create the element.
                el = new CKEDITOR.dom.element( elementName, targetDocument );
-                // #6226: attributes should be copied before the new ones are applied
+                // http://dev.ckeditor.com/ticket/6226: attributes should be copied before the new ones are applied
                if ( element )
                        element.copyAttributes( el );
@@ -1794,15 +1799,28 @@ CKEDITOR.STYLE_OBJECT = 3;
        // is treated as a wildcard which will match any value.
        // @param {Object/String} source
        // @param {Object/String} target
+        // @returns {Boolean}
        function compareCssText( source, target ) {
+                function filter( string, propertyName ) {
+                        // In case of font-families we'll skip quotes. (http://dev.ckeditor.com/ticket/10750)
+                        return propertyName.toLowerCase() == 'font-family' ? string.replace( /["']/g, '' ) : string;
+                }
                if ( typeof source == 'string' )
                        source = CKEDITOR.tools.parseCssText( source );
                if ( typeof target == 'string' )
                        target = CKEDITOR.tools.parseCssText( target, true );
                for ( var name in source ) {
-                        if ( !( name in target && ( target[ name ] == source[ name ] || source[ name ] == 'inherit' || target[ name ] == 'inherit' ) ) )
+                        if ( !( name in target ) ) {
                                return false;
+                        }
+                        if ( !( filter( target[ name ], name ) == filter( source[ name ], name ) ||
+                                source[ name ] == 'inherit' ||
+                                target[ name ] == 'inherit' ) ) {
+                                return false;
+                        }
                }
                return true;
        }
@@ -1811,13 +1829,25 @@ CKEDITOR.STYLE_OBJECT = 3;
                var doc = selection.document,
                        ranges = selection.getRanges(),
                        func = remove ? this.removeFromRange : this.applyToRange,
-                        range;
+                        originalRanges,
+                        range,
+                        i;
+                // In case of fake table selection, we would like to apply all styles and then select
+                // the original ranges. Otherwise browsers would complain about discontiguous selection.
+                if ( selection.isFake && selection.isInTable() ) {
+                        originalRanges = [];
+                        for ( i = 0; i < ranges.length; i++ ) {
+                                originalRanges.push( ranges[ i ].clone() );
+                        }
+                }
                var iterator = ranges.createIterator();
                while ( ( range = iterator.getNextRange() ) )
                        func.call( this, range, editor );
-                selection.selectRanges( ranges );
+                selection.selectRanges( originalRanges || ranges );
                doc.removeCustomData( 'doc_processing_style' );
        }
 } )();
@@ -1888,7 +1918,7 @@ CKEDITOR.styleCommand.prototype.exec = function( editor ) {
 */
 CKEDITOR.stylesSet = new CKEDITOR.resourceManager( '', 'stylesSet' );
-// Backward compatibility (#5025).
+// Backward compatibility (http://dev.ckeditor.com/ticket/5025).
 CKEDITOR.addStylesSet = CKEDITOR.tools.bind( CKEDITOR.stylesSet.add, CKEDITOR.stylesSet );
 CKEDITOR.loadStylesSet = function( name, url, callback ) {
        CKEDITOR.stylesSet.addExternal( name, url, '' );
@@ -1991,7 +2021,7 @@ CKEDITOR.tools.extend( CKEDITOR.editor.prototype, {
                                return;
                        }
-                        // #5352 Allow to define the styles directly in the config object
+                        // http://dev.ckeditor.com/ticket/5352 Allow to define the styles directly in the config object
                        if ( configStyleSet instanceof Array ) {
                                editor._.stylesDefinitions = configStyleSet;
                                callback( configStyleSet );
diff --git a/sources/core/template.js b/sources/core/template.js
index a3fe55b..a627c34 100644
--- a/sources/core/template.js
+++ b/sources/core/template.js
@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 * For licensing, see LICENSE.md or http://ckeditor.com/license
 */
@@ -9,11 +9,7 @@
 */
 ( function() {
-        var cache = {},
+        var rePlaceholder = /{([^}]+)}/g;
-                rePlaceholder = /{([^}]+)}/g,
-                reEscapableChars = /([\\'])/g,
-                reNewLine = /\n/g,
-                reCarriageReturn = /\r/g;
        /**
         * Lightweight template used to build the output string from variables.
@@ -27,42 +23,35 @@
         * @param {String} source The template source.
         */
        CKEDITOR.template = function( source ) {
-                // Builds an optimized function body for the output() method, focused on performance.
+                /**
-                // For example, if we have this "source":
+                 * The current template source.
-                //      '<div style="{style}">{editorName}</div>'
+                 *
-                // ... the resulting function body will be (apart from the "buffer" handling):
+                 * @readonly
-                //      return [ '<div style="', data['style'] == undefined ? '{style}' : data['style'], '">', data['editorName'] == undefined ? '{editorName}' : data['editorName'], '</div>' ].join('');
+                 * @member CKEDITOR.template
+                 * @property {String}
+                 */
+                this.source = String( source );
+        };
-                // Try to read from the cache.
+        /**
-                if ( cache[ source ] )
+         * Processes the template, filling its variables with the provided data.
-                        this.output = cache[ source ];
+         *
-                else {
+         * @method
-                        var fn = source
+         * @member CKEDITOR.template
-                                // Escape chars like slash "\" or single quote "'".
+         * @param {Object} data An object containing properties whose values will be
-                                .replace( reEscapableChars, '\\$1' )
+         * used to fill the template variables. The property names must match the
-                                .replace( reNewLine, '\\n' )
+         * template variables names. Variables without matching properties will be
-                                .replace( reCarriageReturn, '\\r' )
+         * kept untouched.
-                                // Inject the template keys replacement.
+         * @param {Array} [buffer] An array that the output data will be pushed into.
-                                .replace( rePlaceholder, function( m, key ) {
+         * The number of entries appended to the array is unknown.
-                                        return "',data['" + key + "']==undefined?'{" + key + "}':data['" + key + "'],'";
+         * @returns {String/Number} If `buffer` has not been provided, the processed
-                                } );
+         * template output data; otherwise the new length of `buffer`.
+         */
+        CKEDITOR.template.prototype.output = function( data, buffer ) {
+                var output = this.source.replace( rePlaceholder, function( fullMatch, dataKey ) {
+                        return data[ dataKey ] !== undefined ? data[ dataKey ] : fullMatch;
+                } );
-                        fn = "return buffer?buffer.push('" + fn + "'):['" + fn + "'].join('');";
+                return buffer ? buffer.push( output ) : output;
-                        this.output = cache[ source ] = Function( 'data', 'buffer', fn );
-                }
        };
 } )();
-/**
- * Processes the template, filling its variables with the provided data.
- *
- * @method output
- * @param {Object} data An object containing properties which values will be
- * used to fill the template variables. The property names must match the
- * template variables names. Variables without matching properties will be
- * kept untouched.
- * @param {Array} [buffer] An array into which the output data will be pushed into.
- * The number of entries appended to the array is unknown.
- * @returns {String/Number} If `buffer` has not been provided, the processed
- * template output data, otherwise the new length of `buffer`.
- */
diff --git a/sources/core/tools.js b/sources/core/tools.js
index ae5b4d0..a4b736d 100644
--- a/sources/core/tools.js
+++ b/sources/core/tools.js
@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 * For licensing, see LICENSE.md or http://ckeditor.com/license
 */
@@ -981,6 +981,23 @@
                },
                /**
+                 * Normalizes hexadecimal notation so that the color string is always 6 characters long and lowercase.
+                 *
+                 * @param {String} styleText The style data (or just a string containing hex colors) to be converted.
+                 * @returns {String} The style data with hex colors normalized.
+                 */
+                normalizeHex: function( styleText ) {
+                        return styleText.replace( /#(([0-9a-f]{3}){1,2})($|;|\s+)/gi, function( match, hexColor, hexColorPart, separator ) {
+                                var normalizedHexColor = hexColor.toLowerCase();
+                                if ( normalizedHexColor.length == 3 ) {
+                                        var parts = normalizedHexColor.split( '' );
+                                        normalizedHexColor = [ parts[ 0 ], parts[ 0 ], parts[ 1 ], parts[ 1 ], parts[ 2 ], parts[ 2 ] ].join( '' );
+                                }
+                                return '#' + normalizedHexColor + separator;
+                        } );
+                },
+                /**
                 * Turns inline style text properties into one hash.
                 *
                 * @param {String} styleText The style data to be parsed.
@@ -996,21 +1013,24 @@
                                // Injects the style in a temporary span object, so the browser parses it,
                                // retrieving its final format.
                                var temp = new CKEDITOR.dom.element( 'span' );
-                                temp.setAttribute( 'style', styleText );
+                                styleText = temp.setAttribute( 'style', styleText ).getAttribute( 'style' ) || '';
-                                styleText = CKEDITOR.tools.convertRgbToHex( temp.getAttribute( 'style' ) || '' );
+                        }
+                        // Normalize colors.
+                        if ( styleText ) {
+                                styleText = CKEDITOR.tools.normalizeHex( CKEDITOR.tools.convertRgbToHex( styleText ) );
                        }
-                        // IE will leave a single semicolon when failed to parse the style text. (#3891)
+                        // IE will leave a single semicolon when failed to parse the style text. (http://dev.ckeditor.com/ticket/3891)
                        if ( !styleText || styleText == ';' )
                                return retval;
                        styleText.replace( /&quot;/g, '"' ).replace( /\s*([^:;\s]+)\s*:\s*([^;]+)\s*(?=;|$)/g, function( match, name, value ) {
                                if ( normalize ) {
                                        name = name.toLowerCase();
-                                        // Normalize font-family property, ignore quotes and being case insensitive. (#7322)
+                                        // Drop extra whitespacing from font-family.
-                                        // http://www.w3.org/TR/css3-fonts/#font-family-the-font-family-property
                                        if ( name == 'font-family' )
-                                                value = value.toLowerCase().replace( /["']/g, '' ).replace( /\s*,\s*/g, ',' );
+                                                value = value.replace( /\s*,\s*/g, ',' );
                                        value = CKEDITOR.tools.trim( value );
                                }
@@ -1293,6 +1313,67 @@
                },
                /**
+                 * Converts a keystroke to its string representation. Returns an object with two fields:
+                 *
+                 * * `display` &ndash; A string that should be used for visible labels.
+                 * For Mac devices it uses `⌥` for `ALT`, `⇧` for `SHIFT` and `⌘` for `COMMAND`.
+                 * * `aria` &ndash; A string that should be used for ARIA descriptions.
+                 * It does not use special characters such as `⌥`, `⇧` or `⌘`.
+                 *
+                 *              var lang = editor.lang.common.keyboard;
+                 *              var shortcut = CKEDITOR.tools.keystrokeToString( lang, CKEDITOR.CTRL + 88 );
+                 *              console.log( shortcut.display ); // 'CTRL + X', on Mac '⌘ + X'.
+                 *              console.log( shortcut.aria ); // 'CTRL + X', on Mac 'COMMAND + X'.
+                 *
+                 * @since 4.6.0
+                 * @param {Object} lang A language object with the key name translation.
+                 * @param {Number} keystroke The keystroke to convert.
+                 * @returns {{display: String, aria: String}}
+                 */
+                keystrokeToString: function( lang, keystroke ) {
+                        var special = keystroke & 0xFF0000,
+                                key = keystroke & 0x00FFFF,
+                                isMac = CKEDITOR.env.mac,
+                                CTRL = 17,
+                                CMD = 224,
+                                ALT = 18,
+                                SHIFT = 16,
+                                display = [],
+                                aria = [];
+                        if ( special & CKEDITOR.CTRL ) {
+                                display.push( isMac ? '⌘' : lang[ CTRL ] );
+                                aria.push( isMac ? lang[ CMD ] : lang[ CTRL ] );
+                        }
+                        if ( special & CKEDITOR.ALT ) {
+                                display.push( isMac ? '⌥' : lang[ ALT ] );
+                                aria.push( lang[ ALT ] );
+                        }
+                        if ( special & CKEDITOR.SHIFT ) {
+                                display.push( isMac ? '⇧' : lang[ SHIFT ] );
+                                aria.push( lang[ SHIFT ] );
+                        }
+                        if ( key ) {
+                                if ( lang[ key ] ) {
+                                        display.push( lang[ key ] );
+                                        aria.push( lang[ key ] );
+                                } else {
+                                        display.push( String.fromCharCode( key ) );
+                                        aria.push( String.fromCharCode( key ) );
+                                }
+                        }
+                        return {
+                                display: display.join( '+' ),
+                                aria: aria.join( '+' )
+                        };
+                },
+                /**
                 * The data URI of a transparent image. May be used e.g. in HTML as an image source or in CSS in `url()`.
                 *
                 * @since 4.4
@@ -1353,6 +1434,540 @@
                        }
                        return token;
+                },
+                /**
+                 * Returns an escaped CSS selector. `CSS.escape()` is used if defined, leading digit is escaped otherwise.
+                 *
+                 * @since 4.5.10
+                 * @param {String} selector A CSS selector to escape.
+                 * @returns {String} An escaped selector.
+                 */
+                escapeCss: function( selector ) {
+                        // Invalid input.
+                        if ( !selector ) {
+                                return '';
+                        }
+                        // CSS.escape() can be used.
+                        if ( window.CSS && CSS.escape ) {
+                                return CSS.escape( selector );
+                        }
+                        // Simple leading digit escape.
+                        if ( !isNaN( parseInt( selector.charAt( 0 ), 10 ) ) ) {
+                                return '\\3' + selector.charAt( 0 ) + ' ' + selector.substring( 1, selector.length );
+                        }
+                        return selector;
+                },
+                /**
+                 * Detects which mouse button generated a given DOM event.
+                 *
+                 * @since 4.7.3
+                 * @param {CKEDITOR.dom.event} evt DOM event.
+                 * @returns {Number|Boolean} Returns a number indicating the mouse button or `false`
+                 * if the mouse button cannot be determined.
+                 */
+                getMouseButton: function( evt ) {
+                        var evtData = evt.data,
+                                domEvent = evtData && evtData.$;
+                        if ( !( evtData && domEvent ) ) {
+                                // Added in case when there's no data available. That's the case in some unit test in built version which
+                                // mock event but doesn't put data object.
+                                return false;
+                        }
+                        if ( CKEDITOR.env.ie && CKEDITOR.env.version < 9 ) {
+                                if ( domEvent.button === 4 ) {
+                                        return CKEDITOR.MOUSE_BUTTON_MIDDLE;
+                                } else if ( domEvent.button === 1 ) {
+                                        return CKEDITOR.MOUSE_BUTTON_LEFT;
+                                } else {
+                                        return CKEDITOR.MOUSE_BUTTON_RIGHT;
+                                }
+                        }
+                        return domEvent.button;
+                },
+                /**
+                 * A set of functions for operations on styles.
+                 *
+                 * @property {CKEDITOR.tools.style}
+                 */
+                style: {
+                        /**
+                         * Methods to parse miscellaneous CSS properties.
+                         *
+                         * @property {CKEDITOR.tools.style.parse}
+                         * @member CKEDITOR.tools.style
+                         */
+                        parse: {
+                                // Color list based on https://www.w3.org/TR/css-color-4/#named-colors.
+                                _colors: {
+                                        aliceblue: '#F0F8FF',
+                                        antiquewhite: '#FAEBD7',
+                                        aqua: '#00FFFF',
+                                        aquamarine: '#7FFFD4',
+                                        azure: '#F0FFFF',
+                                        beige: '#F5F5DC',
+                                        bisque: '#FFE4C4',
+                                        black: '#000000',
+                                        blanchedalmond: '#FFEBCD',
+                                        blue: '#0000FF',
+                                        blueviolet: '#8A2BE2',
+                                        brown: '#A52A2A',
+                                        burlywood: '#DEB887',
+                                        cadetblue: '#5F9EA0',
+                                        chartreuse: '#7FFF00',
+                                        chocolate: '#D2691E',
+                                        coral: '#FF7F50',
+                                        cornflowerblue: '#6495ED',
+                                        cornsilk: '#FFF8DC',
+                                        crimson: '#DC143C',
+                                        cyan: '#00FFFF',
+                                        darkblue: '#00008B',
+                                        darkcyan: '#008B8B',
+                                        darkgoldenrod: '#B8860B',
+                                        darkgray: '#A9A9A9',
+                                        darkgreen: '#006400',
+                                        darkgrey: '#A9A9A9',
+                                        darkkhaki: '#BDB76B',
+                                        darkmagenta: '#8B008B',
+                                        darkolivegreen: '#556B2F',
+                                        darkorange: '#FF8C00',
+                                        darkorchid: '#9932CC',
+                                        darkred: '#8B0000',
+                                        darksalmon: '#E9967A',
+                                        darkseagreen: '#8FBC8F',
+                                        darkslateblue: '#483D8B',
+                                        darkslategray: '#2F4F4F',
+                                        darkslategrey: '#2F4F4F',
+                                        darkturquoise: '#00CED1',
+                                        darkviolet: '#9400D3',
+                                        deeppink: '#FF1493',
+                                        deepskyblue: '#00BFFF',
+                                        dimgray: '#696969',
+                                        dimgrey: '#696969',
+                                        dodgerblue: '#1E90FF',
+                                        firebrick: '#B22222',
+                                        floralwhite: '#FFFAF0',
+                                        forestgreen: '#228B22',
+                                        fuchsia: '#FF00FF',
+                                        gainsboro: '#DCDCDC',
+                                        ghostwhite: '#F8F8FF',
+                                        gold: '#FFD700',
+                                        goldenrod: '#DAA520',
+                                        gray: '#808080',
+                                        green: '#008000',
+                                        greenyellow: '#ADFF2F',
+                                        grey: '#808080',
+                                        honeydew: '#F0FFF0',
+                                        hotpink: '#FF69B4',
+                                        indianred: '#CD5C5C',
+                                        indigo: '#4B0082',
+                                        ivory: '#FFFFF0',
+                                        khaki: '#F0E68C',
+                                        lavender: '#E6E6FA',
+                                        lavenderblush: '#FFF0F5',
+                                        lawngreen: '#7CFC00',
+                                        lemonchiffon: '#FFFACD',
+                                        lightblue: '#ADD8E6',
+                                        lightcoral: '#F08080',
+                                        lightcyan: '#E0FFFF',
+                                        lightgoldenrodyellow: '#FAFAD2',
+                                        lightgray: '#D3D3D3',
+                                        lightgreen: '#90EE90',
+                                        lightgrey: '#D3D3D3',
+                                        lightpink: '#FFB6C1',
+                                        lightsalmon: '#FFA07A',
+                                        lightseagreen: '#20B2AA',
+                                        lightskyblue: '#87CEFA',
+                                        lightslategray: '#778899',
+                                        lightslategrey: '#778899',
+                                        lightsteelblue: '#B0C4DE',
+                                        lightyellow: '#FFFFE0',
+                                        lime: '#00FF00',
+                                        limegreen: '#32CD32',
+                                        linen: '#FAF0E6',
+                                        magenta: '#FF00FF',
+                                        maroon: '#800000',
+                                        mediumaquamarine: '#66CDAA',
+                                        mediumblue: '#0000CD',
+                                        mediumorchid: '#BA55D3',
+                                        mediumpurple: '#9370DB',
+                                        mediumseagreen: '#3CB371',
+                                        mediumslateblue: '#7B68EE',
+                                        mediumspringgreen: '#00FA9A',
+                                        mediumturquoise: '#48D1CC',
+                                        mediumvioletred: '#C71585',
+                                        midnightblue: '#191970',
+                                        mintcream: '#F5FFFA',
+                                        mistyrose: '#FFE4E1',
+                                        moccasin: '#FFE4B5',
+                                        navajowhite: '#FFDEAD',
+                                        navy: '#000080',
+                                        oldlace: '#FDF5E6',
+                                        olive: '#808000',
+                                        olivedrab: '#6B8E23',
+                                        orange: '#FFA500',
+                                        orangered: '#FF4500',
+                                        orchid: '#DA70D6',
+                                        palegoldenrod: '#EEE8AA',
+                                        palegreen: '#98FB98',
+                                        paleturquoise: '#AFEEEE',
+                                        palevioletred: '#DB7093',
+                                        papayawhip: '#FFEFD5',
+                                        peachpuff: '#FFDAB9',
+                                        peru: '#CD853F',
+                                        pink: '#FFC0CB',
+                                        plum: '#DDA0DD',
+                                        powderblue: '#B0E0E6',
+                                        purple: '#800080',
+                                        rebeccapurple: '#663399',
+                                        red: '#FF0000',
+                                        rosybrown: '#BC8F8F',
+                                        royalblue: '#4169E1',
+                                        saddlebrown: '#8B4513',
+                                        salmon: '#FA8072',
+                                        sandybrown: '#F4A460',
+                                        seagreen: '#2E8B57',
+                                        seashell: '#FFF5EE',
+                                        sienna: '#A0522D',
+                                        silver: '#C0C0C0',
+                                        skyblue: '#87CEEB',
+                                        slateblue: '#6A5ACD',
+                                        slategray: '#708090',
+                                        slategrey: '#708090',
+                                        snow: '#FFFAFA',
+                                        springgreen: '#00FF7F',
+                                        steelblue: '#4682B4',
+                                        tan: '#D2B48C',
+                                        teal: '#008080',
+                                        thistle: '#D8BFD8',
+                                        tomato: '#FF6347',
+                                        turquoise: '#40E0D0',
+                                        violet: '#EE82EE',
+                                        wheat: '#F5DEB3',
+                                        white: '#FFFFFF',
+                                        whitesmoke: '#F5F5F5',
+                                        yellow: '#FFFF00',
+                                        yellowgreen: '#9ACD32'
+                                },
+                                _borderStyle: [
+                                        'none',
+                                        'hidden',
+                                        'dotted',
+                                        'dashed',
+                                        'solid',
+                                        'double',
+                                        'groove',
+                                        'ridge',
+                                        'inset',
+                                        'outset'
+                                ],
+                                _widthRegExp: /^(thin|medium|thick|[\+-]?\d+(\.\d+)?[a-z%]+|[\+-]?0+(\.0+)?|\.\d+[a-z%]+)$/,
+                                _rgbaRegExp: /rgba?\(\s*\d+%?\s*,\s*\d+%?\s*,\s*\d+%?\s*(?:,\s*[0-9.]+\s*)?\)/gi,
+                                _hslaRegExp: /hsla?\(\s*[0-9.]+\s*,\s*\d+%\s*,\s*\d+%\s*(?:,\s*[0-9.]+\s*)?\)/gi,
+                                /**
+                                 * Parses the `value` used as a `background` property shorthand and returns information as an object.
+                                 *
+                                 * **Note:** Currently only the `color` property is extracted. Any other parts will go into the `unprocessed` property.
+                                 *
+                                 *              var background = CKEDITOR.tools.style.parse.background( '#0C0 url(foo.png)' );
+                                 *              console.log( background );
+                                 *              // Logs: { color: '#0C0', unprocessed: 'url(foo.png)' }
+                                 *
+                                 * @param {String} value The value of the `background` property.
+                                 * @returns {Object} An object with information extracted from the background.
+                                 * @returns {String} return.color The **first** color value found. The color format remains the same as in input.
+                                 * @returns {String} return.unprocessed The remaining part of the `value` that has not been processed.
+                                 * @member CKEDITOR.tools.style.parse
+                                 */
+                                background: function( value ) {
+                                        var ret = {},
+                                                colors = this._findColor( value );
+                                        if ( colors.length ) {
+                                                ret.color = colors[ 0 ];
+                                                CKEDITOR.tools.array.forEach( colors, function( colorToken ) {
+                                                        value = value.replace( colorToken, '' );
+                                                } );
+                                        }
+                                        value = CKEDITOR.tools.trim( value );
+                                        if ( value ) {
+                                                // If anything was left unprocessed include it as unprocessed part.
+                                                ret.unprocessed = value;
+                                        }
+                                        return ret;
+                                },
+                                /**
+                                 * Parses the `margin` CSS property shorthand format.
+                                 *
+                                 *              console.log( CKEDITOR.tools.parse.margin( '3px 0 2' ) );
+                                 *              // Logs: { top: "3px", right: "0", bottom: "2", left: "0" }
+                                 *
+                                 * @param {String} value The `margin` property value.
+                                 * @returns {Object}
+                                 * @returns {Number} return.top Top margin.
+                                 * @returns {Number} return.right Right margin.
+                                 * @returns {Number} return.bottom Bottom margin.
+                                 * @returns {Number} return.left Left margin.
+                                 * @member CKEDITOR.tools.style.parse
+                                 */
+                                margin: function( value ) {
+                                        var ret = {};
+                                        var widths = value.match( /(?:\-?[\.\d]+(?:%|\w*)|auto|inherit|initial|unset)/g ) || [ '0px' ];
+                                        switch ( widths.length ) {
+                                                case 1:
+                                                        mapStyles( [ 0, 0, 0, 0 ] );
+                                                        break;
+                                                case 2:
+                                                        mapStyles( [ 0, 1, 0, 1 ] );
+                                                        break;
+                                                case 3:
+                                                        mapStyles( [ 0, 1, 2, 1 ] );
+                                                        break;
+                                                case 4:
+                                                        mapStyles( [ 0, 1, 2, 3 ] );
+                                                        break;
+                                        }
+                                        function mapStyles( map ) {
+                                                ret.top = widths[ map[ 0 ] ];
+                                                ret.right = widths[ map[ 1 ] ];
+                                                ret.bottom = widths[ map[ 2 ] ];
+                                                ret.left = widths[ map[ 3 ] ];
+                                        }
+                                        return ret;
+                                },
+                                /**
+                                 * Parses the `border` CSS property shorthand format.
+                                 * This CSS property does not support inheritance (https://www.w3.org/TR/css3-background/#the-border-shorthands).
+                                 *
+                                 *              console.log( CKEDITOR.tools.style.parse.border( '3px solid #ffeedd' ) );
+                                 *              // Logs: { width: "3px", style: "solid", color: "#ffeedd" }
+                                 *
+                                 * @param {String} value The `border` property value.
+                                 * @returns {Object}
+                                 * @returns {String} return.width The border-width attribute.
+                                 * @returns {String} return.style The border-style attribute.
+                                 * @returns {String} return.color The border-color attribute.
+                                 * @member CKEDITOR.tools.style.parse
+                                 */
+                                border: function( value ) {
+                                        var ret = {},
+                                                input = value.split( /\s+/ );
+                                        CKEDITOR.tools.array.forEach( input, function( val ) {
+                                                if ( !ret.color ) {
+                                                        var parseColor = CKEDITOR.tools.style.parse._findColor( val );
+                                                        if ( parseColor.length ) {
+                                                                ret.color = parseColor[ 0 ];
+                                                                return;
+                                                        }
+                                                }
+                                                if ( !ret.style ) {
+                                                        if ( CKEDITOR.tools.indexOf( CKEDITOR.tools.style.parse._borderStyle, val ) !== -1 ) {
+                                                                ret.style = val;
+                                                                return;
+                                                        }
+                                                }
+                                                if ( !ret.width ) {
+                                                        if ( CKEDITOR.tools.style.parse._widthRegExp.test( val ) ) {
+                                                                ret.width = val;
+                                                                return;
+                                                        }
+                                                }
+                                        } );
+                                        return ret;
+                                },
+                                /**
+                                 * Searches the `value` for any CSS color occurrences and returns it.
+                                 *
+                                 * @private
+                                 * @param {String} value
+                                 * @returns {String[]} An array of matched results.
+                                 * @member CKEDITOR.tools.style.parse
+                                 */
+                                _findColor: function( value ) {
+                                        var ret = [],
+                                                arrayTools = CKEDITOR.tools.array;
+                                        // Check for rgb(a).
+                                        ret = ret.concat( value.match( this._rgbaRegExp ) || [] );
+                                        // Check for hsl(a).
+                                        ret = ret.concat( value.match( this._hslaRegExp ) || [] );
+                                        ret = ret.concat( arrayTools.filter( value.split( /\s+/ ), function( colorEntry ) {
+                                                // Check for hex format.
+                                                if ( colorEntry.match( /^\#[a-f0-9]{3}(?:[a-f0-9]{3})?$/gi ) ) {
+                                                        return true;
+                                                }
+                                                // Check for preset names.
+                                                return colorEntry.toLowerCase() in CKEDITOR.tools.style.parse._colors;
+                                        } ) );
+                                        return ret;
+                                }
+                        }
+                },
+                /**
+                 * A set of array helpers.
+                 *
+                 * @property {CKEDITOR.tools.array}
+                 * @member CKEDITOR.tools
+                 */
+                array: {
+                        /**
+                         * Returns a copy of `array` filtered using the `fn` function. Any elements that the `fn` will return `false` for
+                         * will get removed from the returned array.
+                         *
+                         *              var filtered = this.array.filter( [ 0, 1, 2, 3 ], function( value ) {
+                         *                      // Leave only values equal or greater than 2.
+                         *                      return value >= 2;
+                         *              } );
+                         *              console.log( filtered );
+                         *              // Logs: [ 2, 3 ]
+                         *
+                         * @param {Array} array
+                         * @param {Function} fn A function that gets called with each `array` item. Any item that `fn`
+                         * returned a `false`-alike value for will be filtered out of the `array`.
+                         * @param {Mixed} fn.value The currently iterated array value.
+                         * @param {Number} fn.index The index of the currently iterated value in an array.
+                         * @param {Array} fn.array The original array passed as the `array` variable.
+                         * @param {Mixed} [thisArg=undefined] A context object for `fn`.
+                         * @returns {Array} The filtered array.
+                         * @member CKEDITOR.tools.array
+                         */
+                        filter: function( array, fn, thisArg ) {
+                                var ret = [];
+                                this.forEach( array, function( val, i ) {
+                                        if ( fn.call( thisArg, val, i, array ) ) {
+                                                ret.push( val );
+                                        }
+                                } );
+                                return ret;
+                        },
+                        /**
+                         * Iterates over every element in the `array`.
+                         *
+                         * @param {Array} array An array to be iterated over.
+                         * @param {Function} fn The function called for every `array` element.
+                         * @param {Mixed} fn.value The currently iterated array value.
+                         * @param {Number} fn.index The index of the currently iterated value in an array.
+                         * @param {Array} fn.array The original array passed as an `array` variable.
+                         * @param {Mixed} [thisArg=undefined] The context object for `fn`.
+                         * @member CKEDITOR.tools.array
+                         */
+                        forEach: function( array, fn, thisArg ) {
+                                var len = array.length,
+                                        i;
+                                for ( i = 0; i < len; i++ ) {
+                                        fn.call( thisArg, array[ i ], i, array );
+                                }
+                        },
+                        /**
+                         * Applies a function to each element of an array and returns the array of results in the same order.
+                         * Note the order of the parameters.
+                         *
+                         * @param {Array} array An array of elements that `fn` is applied on.
+                         * @param {Function} fn A function with the signature `a -> b`.
+                         * @param {Mixed} [thisArg=undefined] The context object for `fn`.
+                         * @returns {Array} An array of mapped elements.
+                         * @member CKEDITOR.tools.array
+                         * @since 4.6.2
+                         */
+                        map: function( array, fn, thisArg ) {
+                                var result = [];
+                                for ( var i = 0; i < array.length; i++ ) {
+                                        result.push( fn.call( thisArg, array[ i ], i, array ) );
+                                }
+                                return result;
+                        },
+                        /**
+                         * Applies a function against each value in an array storing the result in an accumulator passed to the next iteration.
+                         * Note the order of the parameters.
+                         *
+                         * @param {Array} array An array of elements that `fn` is applied on.
+                         * @param {Function} fn A function with the signature `(accumulator, a, index, array) -> b`.
+                         * @param {Mixed} initial Initial value of the accumulator.
+                         * @param {Mixed} [thisArg=undefined] The context object for `fn`.
+                         * @returns {Mixed} The final value of the accumulator.
+                         * @member CKEDITOR.tools.array
+                         * @since 4.6.2
+                        */
+                        reduce: function( array, fn, initial, thisArg ) {
+                                var acc = initial;
+                                for ( var i = 0; i < array.length; i++ ) {
+                                        acc = fn.call( thisArg, acc, array[ i ], i, array );
+                                }
+                                return acc;
+                        }
+                },
+                /**
+                 * A set of object helpers.
+                 *
+                 * @property {CKEDITOR.tools.object}
+                 * @member CKEDITOR.tools
+                 */
+                object: {
+                        /**
+                         * Returns the first key from `obj` which has a given `value`.
+                         *
+                         * @param {Object} obj An object whose `key` is looked for.
+                         * @param {Mixed} value An object's `value` to be looked for.
+                         * @returns {String/null} Matched `key` or `null` if not found.
+                         * @member CKEDITOR.tools.object
+                         */
+                        findKey: function( obj, value ) {
+                                if ( typeof obj !== 'object' ) {
+                                        return null;
+                                }
+                                var key;
+                                for ( key in obj ) {
+                                        if ( obj[ key ] === value ) {
+                                                return key;
+                                        }
+                                }
+                                return null;
+                        }
                }
        };
@@ -1381,6 +1996,78 @@
                return result;
        }
+        /**
+         * @member CKEDITOR.tools.array
+         * @method indexOf
+         * @inheritdoc CKEDITOR.tools#indexOf
+         */
+        CKEDITOR.tools.array.indexOf = CKEDITOR.tools.indexOf;
+        /**
+         * @member CKEDITOR.tools.array
+         * @method isArray
+         * @inheritdoc CKEDITOR.tools#isArray
+         */
+        CKEDITOR.tools.array.isArray = CKEDITOR.tools.isArray;
+        /**
+         * Left mouse button.
+         *
+         * @since 4.7.3
+         * @readonly
+         * @property {Number} [=0]
+         * @member CKEDITOR
+         */
+        CKEDITOR.MOUSE_BUTTON_LEFT = 0;
+        /**
+         * Middle mouse button.
+         *
+         * @since 4.7.3
+         * @readonly
+         * @property {Number} [=1]
+         * @member CKEDITOR
+         */
+        CKEDITOR.MOUSE_BUTTON_MIDDLE = 1;
+        /**
+         * Right mouse button.
+         *
+         * @since 4.7.3
+         * @readonly
+         * @property {Number} [=2]
+         * @member CKEDITOR
+         */
+        CKEDITOR.MOUSE_BUTTON_RIGHT = 2;
+        /**
+         * The namespace containing functions to work on CSS properties.
+         *
+         * @since 4.6.1
+         * @class CKEDITOR.tools.style
+         */
+        /**
+         * The namespace with helper functions to parse some common CSS properties.
+         *
+         * @since 4.6.1
+         * @class CKEDITOR.tools.style.parse
+         */
+        /**
+         * The namespace with helper functions and polyfills for arrays.
+         *
+         * @since 4.6.1
+         * @class CKEDITOR.tools.array
+         */
+        /**
+         * The namespace with helper functions and polyfills for objects.
+         *
+         * @since 4.7.1
+         * @class CKEDITOR.tools.object
+         */
 } )();
 // PACKAGER_RENAME( CKEDITOR.tools )
diff --git a/sources/core/ui.js b/sources/core/ui.js
index 29ab0ad..ac5a285 100644
--- a/sources/core/ui.js
+++ b/sources/core/ui.js
@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 * For licensing, see LICENSE.md or http://ckeditor.com/license
 */