Sync'd branch projects/cedar with upstream @ Thu Oct 30 15:39:06 PDT 2014