Fix build problem
Merge branch 'master' of github.com:skyscreamer/yoga