Preparation for python3 migration
Merge branch 'develop'
Drop python2.5
Merge branch 'develop'