Issue #2393925: Fix for QUnit test causing problem in Travis CI
Merge branch 'Issue-2393925' into RC