Sync'd branch projects/cedar with upstream @ Tue Sep  9 04:07:55 PDT 2014