Sync'd branch projects/cedar with upstream @ Wed Nov  5 13:43:25 PST 2014