Sync'd branch projects/maple with upstream @ Fri Oct 24 14:45:42 PDT 2014