Sync'd branch projects/cedar with upstream @ Wed Oct  8 12:57:58 PDT 2014