Merging 3.7

I re-applied all the changes specific for SumoCoders

Note to self: the partner-module has been removed. It should be re-added when it has been rewritten with 3.7 in mind.