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