Sync'd branch projects/cedar with upstream @ Fri Sep 12 09:38:58 PDT 2014