Commit 310f9401 authored by Erick Hitter's avatar Erick Hitter

Merge branch 'update/lamp' into 'master'

Sync with upstream

See merge request !5
parents 18a42825 4f1734c8
Pipeline #1273 passed with stage
in 1 minute and 59 seconds