Sync'd branch projects/jamun with upstream @ Wed Sep  3 09:53:04 PDT 2014