correct paths for x86_64/generic installations
Merge remote-tracking branch 'upstream/master'

Conflicts:
	CMakeLists.txt