setup.py: Use dir names in data_files
Merge branch 'hotfix/1.4.5' into develop