Sync'd branch projects/jamun with upstream @ Thu Sep 25 15:19:04 PDT 2014