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