Add missing include needed on OSX.
Merge branch 'master' into benchmark