Sync'd branch projects/cedar with upstream @ Thu Oct  2 12:30:06 PDT 2014