Merge branch 'master' into dev10

core/vendor/tinymce/init.js

@@ -28,6 +28,7 @@ tinymce.init({
 		path: 'codemirror', // Path to CodeMirror distribution
 		saveCursorPosition: false,    // Insert caret marker
 		config: {           // CodeMirror config object
+			/*theme: 'ambiance',*/
 			mode: 'application/x-httpd-php',
 			indentUnit: 4,
 			lineNumbers: true,
@@ -73,6 +74,7 @@ tinymce.init({
 			'addon/fold/foldgutter.js'
 		],
 		cssFiles: [
+			/*'theme/ambiance.css',*/
 			'addon/dialog/dialog.css',
 			'addon/hint/show-hint.css',
 			'addon/lint/lint.css',

core/vendor/tinymce/plugins/codemirror/source.html

@@ -47,7 +47,7 @@ function inArray(key, arr)
 			indentWithTabs: true,
 			matchBrackets: true,
       saveCursorPosition: true,
-			styleActiveLine: true
+			styleActiveLine: false
 		},
 		jsFiles: [// Default JS files
 			'lib/codemirror.js',