Merge remote branch 'Spielmeister/master' into master

lib/ace/edit_session/fold_line.js

@@ -178,7 +178,7 @@ function FoldLine(foldData, folds) {
                 && fold.start.row != row)
             {
                 //throwing here breaks whole editor
-                //@todo properly handle this
+                //TODO: properly handle this
                 window.console && window.console.log(row, column, fold);
             } else if (fold.start.row == row) {
                 folds = this.folds;

lib/ace/lib/event_emitter.js

@@ -53,7 +53,9 @@ EventEmitter._dispatchEvent = function(eventName, e) {
     if (!listeners.length && !defaultHandler)
         return;
 
-    e = e || {};
+    if (typeof e != "object" || !e)
+        e = {};
+
     if (!e.type)
         e.type = eventName;