apply Gaudi Merge Request 200: gaudi/Gaudi!200 (merged)
Changes I had to make to build Gaudi on MacOS X 10.11.