Sync'd branch projects/maple with upstream @ Mon Oct 20 07:38:15 PDT 2014