Install xorg.conf.d files, use path from Makefile
Merge branch 'release-3.2' into 'develop'

And again...