Sync'd branch projects/cedar with upstream @ Mon Sep 22 14:32:00 PDT 2014