Sync'd branch projects/cedar with upstream @ Fri Oct 24 09:17:28 PDT 2014