Sync with upstream

Erick Hitter requested to merge update/lamp into master

1bd621b1

Merge request reports