Sync'd branch projects/jamun with upstream @ Thu Sep  4 15:29:10 PDT 2014