Document fix for Mac OS X 10.9 build.

Thanks to Albert Azout for the instructions.
Merge remote-tracking branch: upstream/master