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