Re-enabled tests
throwTimeout now really does what the name says
Fix FORGE-1500
Merge branch 'master' into windows