Fix setup.cfg 'upload_all' alias.
Merge branch 'release/1.2.5'
Merge branch 'master' into develop