merge master into stable

Merged Thomas Dobbelaere requested to merge master into stable

not yet activated because ubuntu

Merge request reports