Merge remote branch 'origin/master'

Conflicts:
	lib/ace/editor.js
	lib/ace/test/change_document_test.js
	lib/ace/test/event_emitter_test.js
	lib/ace/test/text_edit_test.js
	lib/ace/test/virtual_renderer_test.js

lib/ace/editor.js

@@ -965,8 +965,8 @@ var Editor =function(renderer, doc) {
         if (!ranges.length)
             return;
 
-		this.clearSelection();
-		this.selection.moveCursorTo(0, 0);
+        this.clearSelection();
+        this.selection.moveCursorTo(0, 0);
 
         for (var i = ranges.length - 1; i >= 0; --i)
             this.$tryReplace(ranges[i], replacement);

lib/ace/test/event_emitter_test.js

@@ -41,7 +41,6 @@ var oop             = require("../lib/oop");
     MEventEmitter   = require("../event_emitter"),
     assert          = require("./assertions");
 
-
 var EventEmitter = function() {};
 
 oop.implement(EventEmitter.prototype, EventEmitter);

lib/ace/test/text_edit_test.js

@@ -48,7 +48,7 @@ global.location     = browser.location;
 
 var Document        = require("../document"),
     Editor          = require("../editor"),
-    JavaScriptMode  = require("../mode/javascript"),
+    JavaScriptMode  = require("../mode/javascript").JavaScript,
     MockRenderer    = require("./mockrenderer"),
     assert          = require("./assertions");
 

lib/ace/test/virtual_renderer_test.js

@@ -35,7 +35,6 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-
 require("../../../support/paths");
 
 var Document        = "../document",

lib/ace/virtual_renderer.js

@@ -373,10 +373,6 @@ var VirtualRenderer = function(container, theme) {
         else if (changes & this.CHANGE_LINES) {
             this.$updateLines();
             this.$updateScrollBar();
-        }
-        else if (changes & this.CHANGE_SCROLL) {
-            this.$textLayer.scrollLines(this.layerConfig);
-            this.showGutter && this.$gutterLayer.update(this.layerConfig);
         } if (changes & this.CHANGE_GUTTER) {
             this.showGutter && this.$gutterLayer.update(this.layerConfig);
         }