Sync'd branch projects/jamun with upstream @ Thu Sep 18 05:09:12 PDT 2014