Add universal Wheel support.
Merge branch 'master' into pr/539