Sync'd branch projects/cedar with upstream @ Wed Nov  5 06:12:01 PST 2014