Fixed osx 10.10 build problem.
Merge remote-tracking branch 'martong/master'
Compare strings using = instead of == in build.sh