Merge branch 'master' into stable

1 job for stable in 5 seconds (queued for 1 second)
Status Job ID Name Coverage
  Test
passed #1320
deploy:staging

00:00:05