Sync'd branch projects/jamun with upstream @ Wed Sep  3 11:13:05 PDT 2014