C7
Merge branch 'master' into daily
disable tests
Merge branch 'master' into daily
Fix circle.yml