Merge API-preserving changes from the master branch into stable. This can be implemented by progressively reducing the difference between the two branches. The most important bits to pull are the ones that ensure python3 compatibility, which in turn is instrumental to have a python3-compatible neubot.