Sync'd branch projects/maple with upstream @ Wed Oct 22 15:37:41 PDT 2014