Sync'd branch projects/cedar with upstream @ Tue Sep  2 12:37:57 PDT 2014