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