Sync'd branch projects/jamun with upstream @ Fri Aug 29 11:34:03 PDT 2014