Added patch from "Schelte Bron" to fix build issue on
Mac OS X