Sync'd branch projects/maple with upstream @ Mon Sep 15 11:41:26 PDT 2014