Sync'd branch projects/cedar with upstream @ Thu Nov 13 03:55:08 PST 2014