Add Python version trove classifiers
Build universal wheels
Merge branch 'master' into next

* master:
  Build universal wheels
  Add Python version trove classifiers