Merge remote-tracking branch 'main/master'
Merge remote-tracking branch 'main/master'
Changed the __APPLE__ define to __llvm__ to be specific about the compiler
Merge pull request #376 from iraklisrossis/master

Fix for last night's broken nightly