Relaxed time constraints some more
Merge branch 'master' into getBinaryCleanup