Fix for MacOS 10.10.

(cherry picked from commit cee167002992832de311e54b49ece06133d1f534)