Sync'd branch projects/jamun with upstream @ Mon Aug 25 16:58:11 PDT 2014