Merge branch 'master' into issue_458

Conflicts:
	circle/dashboard/views/util.py
.gitlab-ci.yml not found in this commit
Status Job ID Name Coverage
  External
passed cloud