Sync'd branch projects/cedar with upstream @ Mon Oct 13 10:13:01 PDT 2014