Sync'd branch projects/cedar with upstream @ Wed Oct 15 16:26:59 PDT 2014