Replace subclassing of six.with_metaclass with a class decorator
Merge pull request #897 from alex/no-more-subclasses-jumping-on-the-bed

Replace subclassing of six.with_metaclass with a class decorator