Fix Python 2.6 compatibility issue.
Merge branch 'develop' of github.com:eseraygun/python-alignment into develop