Sync'd branch projects/cedar with upstream @ Wed Oct 22 08:38:03 PDT 2014