Sync'd branch projects/maple with upstream @ Fri Oct 31 08:41:22 PDT 2014