Sync'd branch projects/cedar with upstream @ Thu Oct  9 04:40:05 PDT 2014