Sync'd branch projects/cedar with upstream @ Tue Aug 26 05:43:24 PDT 2014