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