Sync'd branch projects/maple with upstream @ Mon Nov  3 08:44:23 PST 2014