Merge branch 'master' into dev

# Conflicts:
#	package-lock.json
#	package.json