Sync'd branch projects/maple with upstream @ Thu Oct 30 10:18:40 PDT 2014