Merge branch '3.99' into 4.0

src/core/QueueRunner.js

@@ -215,8 +215,12 @@ getJasmineRequireObj().QueueRunner = function(j$) {
   };
 
   QueueRunner.prototype.diagnoseConflictingAsync_ = function(fn, retval) {
+    var msg;
+
     if (retval && j$.isFunction_(retval.then)) {
-      // Issue a warning that matches the user's code
+      // Issue a warning that matches the user's code.
+      // Omit the stack trace because there's almost certainly no user code
+      // on the stack at this point.
       if (j$.isAsyncFunction_(fn)) {
         this.onException(
           'An asynchronous before/it/after ' +
@@ -232,6 +236,8 @@ getJasmineRequireObj().QueueRunner = function(j$) {
             'function to not return a promise.'
         );
       }
+
+      this.deprecated(msg, { omitStackTrace: true });
     }
   };