Sync'd branch projects/cedar with upstream @ Fri Sep 12 04:54:00 PDT 2014