Sync'd branch projects/cedar with upstream @ Mon Oct  6 21:54:01 PDT 2014