Preprocessor macros for installation
Merge remote-tracking branch 'origin'