Merge "Testrunner: Add timeout support"