Sync'd branch projects/maple with upstream @ Sat Nov  8 11:03:38 PST 2014