Merge branch 'master' into 'smallville_fix'

# Conflicts:
#   circle/vm/tasks/local_periodic_tasks.py
.gitlab-ci.yml not found in this commit
Status Job ID Name Coverage
  External
failed cloud

 
External cloud
No job trace