Sync'd branch projects/cedar with upstream @ Wed Oct  1 05:48:58 PDT 2014