Merge branch 'refs/heads/NinjaInternal' into FileIO

Conflicts:
	.gitignore
	js/ninja.reel/ninja.js

1 files changed, 7 insertions, 0 deletions

diff --git a/node_modules/montage/ui/loader.reel/loader.js b/node_modules/montage/ui/loader.reel/loader.js
index 3809d334..b392c915 100755
--- a/node_modules/montage/ui/loader.reel/loader.js
+++ b/node_modules/montage/ui/loader.reel/loader.js
@@ -403,6 +403,13 @@ exports.Loader = Montage.create(Component, /** @lends module:montage/ui/loader.L
                             }
                             self._revealMainComponent();
                         }, remainingBootstrappingDelay);
+                    } else {
+                        setTimeout(function () {
+                            if (logger.isDebug) {
+                                logger.debug(this, "ok, showing bootstrapper now");
+                            }
+                            self._revealMainComponent();
+                        }, 0);
                     }
                 }