am 0cb1a2f6: am c8f69926: am 27243737: am 1a4b1d52: am 00310299: am 51ef8f39: Merge "Fix compile error on mac 10.9"

* commit '0cb1a2f69a2a2099b3af052eaa2e573e59263b63':