missing include fix
Merge branch 'master' into osx-port