Sync'd branch projects/jamun with upstream @ Sat Aug 23 16:57:07 PDT 2014