untouch code from 2.5.2 python
Merge remote branch 'origin/master'