Sync'd branch projects/cedar with upstream @ Thu Sep 11 16:32:13 PDT 2014