Sync'd branch projects/cedar with upstream @ Tue Nov 11 04:13:03 PST 2014