Sync'd branch projects/jamun with upstream @ Mon Aug 25 18:47:07 PDT 2014