Sync'd branch projects/cedar with upstream @ Fri Oct 10 14:33:03 PDT 2014