Sync'd branch projects/cedar with upstream @ Wed Oct 22 08:07:09 PDT 2014