Merge branch 'develop' into 'master'

See merge request STEP/dev/stationnement!77