Sync'd branch projects/cedar with upstream @ Mon Oct 27 14:07:12 PDT 2014