Sync'd branch projects/cedar with upstream @ Fri Oct 31 13:48:01 PDT 2014