Merge "Follow-up 2454f51b274: Upgrade qunit from 1.x to 2.x too"