Use FindPackages-generated defines.h file
Merge remote-tracking branch 'remotes/origin/master' into configure