Sync'd branch projects/cedar with upstream @ Mon Sep 29 09:21:03 PDT 2014