Conflicts: circle/dashboard/static/dashboard/dashboard.js circle/dashboard/static/dashboard/dashboard.less
Merge branch 'master' into feature-helppage · fee9c1a3