Merge branch 'beta'

# Conflicts:
#	package-lock.json
#	package.json
12 jobs for master in 33 minutes and 18 seconds (queued for 1 second)
Status Job ID Name Coverage
  Setup
passed #300235
install_dependencies

00:07:49

failed #300234
install_dependencies

00:00:16

failed #300228
install_dependencies

00:00:20

failed #300220
install_dependencies

00:00:18

 
  Test
passed #300259
test

00:03:22

failed #300258
test

00:00:19

failed #300249
test

00:00:15

failed #300221
test

00:00:18

 
  Build
passed #300222
build:prod

00:05:55

 
  Deploy
passed #300276
manual
deploy:prod

00:16:10

failed #300275
allowed to fail manual
deploy:prod

00:00:19

failed #300223
allowed to fail manual
deploy:prod

00:00:17