Merge branch 'notifications' into develop

 Conflicts:
	requirements/local.txt
1 job for v0.6.0 in 20 seconds (queued for 12 seconds)
Status Job ID Name Coverage
  Build
passed #16038
docker
build to production

00:00:20