Merge branch 'develop'

# Conflicts:
#	package.json
2 jobs for master in 29 seconds (queued for 1 second)
Status Job ID Name Coverage
  Build
passed #12069
build

00:00:16

passed #12070
publish

00:00:13