Sync'd branch projects/cedar with upstream @ Thu Oct 16 06:19:58 PDT 2014