Sync'd branch projects/cedar with upstream @ Thu Nov  6 15:47:06 PST 2014