Merge branch 'from_supercoop_fixes' into adaptation_supercoop

2 jobs from adaptation_supercoop in 2 minutes 8 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Test
passed #3843
lint:js

00:36

passed #3844
unit:django

01:31