Sync'd branch projects/cedar with upstream @ Mon Nov  3 17:28:03 PST 2014