py3 correction for metaclass
py3 compat
Merge branch '0.10.1' into 0.10.2