Sync'd branch projects/cedar with upstream @ Thu Aug 28 03:19:01 PDT 2014