Master into deathvalley

Merged Wouter Deconinck requested to merge master into deathvalley

Merge recent master commits into deathvalley.

Merge request reports