Sync'd branch projects/cedar with upstream @ Tue Sep 23 10:27:57 PDT 2014