Merge branch 'master' into 'deploy/like-stage'

fix settings_local

See merge request !590
.gitlab-ci.yml not found in this commit
Status Job ID Name Coverage
  External
passed continuous-integration/drone/push

pending continuous-integration/drone/push