Sync'd branch projects/cedar with upstream @ Thu Sep  4 09:43:01 PDT 2014