commit after merge
Merge pull request #402 from rombie/scp_fix

Reduce scp test time for ci_sanity