Python: Fixed rebase conflicts.
Merge pull request #321 from shaitan/lts

Python: Fixed rebase conflicts.