Sync'd branch projects/cedar with upstream @ Tue Sep  9 06:43:57 PDT 2014