Sync'd branch projects/cedar with upstream @ Tue Oct  7 13:18:01 PDT 2014