Sync'd branch projects/cedar with upstream @ Tue Aug 26 09:34:56 PDT 2014