Reset add_metaclass trick, doesnt work with older six module on buildbots.
Merge branch 'aslakbergersen/topic-prepare-py3-rebased' into next