Sync'd branch projects/jamun with upstream @ Thu Sep  4 09:28:07 PDT 2014