Sync'd branch projects/maple with upstream @ Fri Oct 31 14:06:33 PDT 2014