Sync'd branch projects/jamun with upstream @ Thu Sep 11 05:47:08 PDT 2014