Merge branch 'release-3.2' into develop

Backport release-3.2 in develop.
Merge branch 'develop' into release-3.2
Yet another fail...

xorg.conf.d wasn't 'made'.