Sync'd branch projects/cedar with upstream @ Fri Nov  7 14:55:02 PST 2014