Merge branch 'master' into 'add_gitlab_ci'

# Conflicts:
#   .gitlab-ci.yml
#   package.json
2 jobs for add_gitlab_ci in 1 minute and 29 seconds (queued for 1 second)