Sync'd branch projects/maple with upstream @ Mon Oct  6 08:51:11 PDT 2014