Sync'd branch projects/cedar with upstream @ Mon Aug 25 13:32:32 PDT 2014