Sync'd branch projects/cedar with upstream @ Tue Sep  2 07:13:24 PDT 2014