Sync'd branch projects/cedar with upstream @ Tue Nov 11 05:48:06 PST 2014