Sync'd branch projects/jamun with upstream @ Sat Aug 23 11:40:09 PDT 2014