Merge branch 'hotfix/2.2.1'
Remove extra scripts line from setup.py
Merge branch 'master' into develop