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