Merge branch 'develop'

# Conflicts:
#	package.json
2 jobs for master in 28 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Build
passed #12062
build

00:00:14

passed #12063
publish

00:00:13