Merge pull request #2122 from commodo/python-backports-15.05
authorHannu Nyman <[email protected]>
Mon, 14 Dec 2015 17:46:25 +0000 (19:46 +0200)
committerHannu Nyman <[email protected]>
Mon, 14 Dec 2015 17:46:25 +0000 (19:46 +0200)
python: backport some patches from trunk to 15.05


Trivial merge