fix infinitest and nightly scipt
Merge branch 'master' into usagedata