Add .shortdata subpackage to top-level setup.py too
Merge branch 'dev' into python3