Sync'd branch projects/cedar with upstream @ Wed Oct 15 07:44:03 PDT 2014