Sync'd branch projects/cedar with upstream @ Thu Sep  4 01:51:17 PDT 2014