Sync'd branch projects/cedar with upstream @ Wed Oct 22 11:22:59 PDT 2014