Sync'd branch projects/cedar with upstream @ Thu Oct 23 10:28:04 PDT 2014