Sync'd branch projects/jamun with upstream @ Sat Aug 23 20:32:02 PDT 2014