Sync'd branch projects/cedar with upstream @ Wed Oct 22 12:24:00 PDT 2014