Sync'd branch projects/cedar with upstream @ Wed Oct  8 08:59:00 PDT 2014