3.2.1

Merged Philip Müller requested to merge master into 3.2.x-stable

Created by: Kirek

Merge request reports