Sync'd branch projects/cedar with upstream @ Thu Nov  6 05:21:01 PST 2014