Merge "qunit: Increase individual test timeout to 60 seconds"