Sync'd branch projects/cedar with upstream @ Wed Nov 12 11:07:16 PST 2014