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