NB: there are many new failures but it seems more convenient to deal with them on the main py3.6 branch.