Sync'd branch projects/jamun with upstream @ Thu Sep 18 07:24:07 PDT 2014