Merge branch 'soon' into staging

www/common/fileObject.js

@@ -876,7 +876,7 @@ define([
                 var trashFiles = getTrashFiles();
                 var toClean = [];
                 fd.forEach(function (el, idx) {
-                    if (typeof(el) !== "object") {
+                    if (!el || typeof(el) !== "object") {
                         debug("An element in filesData was not an object.", el);
                         toClean.push(el);
                         return;