Sync'd branch projects/cedar with upstream @ Mon Sep  8 08:52:59 PDT 2014