MacOS X fixes
Merge branch 'master' of https://bugengine.googlecode.com/git
build fix