Update setup.py
Merge branch 'stable/2.1.3'