Sync'd branch projects/cedar with upstream @ Fri Oct  3 08:30:01 PDT 2014