Support latest pymads master