setup.py
Merge branch 'dev' into oggsupport