Info about building under OS X
Merge branch '1.x'