Sync'd branch projects/cedar with upstream @ Mon Nov 10 14:16:08 PST 2014