Merge branch 'master' into batch-updates

src/text-editor.coffee

@@ -1817,13 +1817,13 @@ class TextEditor extends Model
 
   # Merge cursors that have the same screen position
   mergeCursors: ->
-    positions = []
+    positions = {}
     for cursor in @getCursors()
       position = cursor.getBufferPosition().toString()
-      if position in positions
+      if positions.hasOwnProperty(position)
         cursor.destroy()
       else
-        positions.push(position)
+        positions[position] = true
 
   preserveCursorPositionOnBufferReload: ->
     cursorPosition = null