Sync'd branch projects/maple with upstream @ Fri Nov  7 13:48:17 PST 2014