Merge pull request #3489 from commodo/for-15.05-backport-python-2.7.12
authorHannu Nyman <hannu.nyman@iki.fi>
Mon, 21 Nov 2016 14:27:23 +0000 (16:27 +0200)
committerGitHub <noreply@github.com>
Mon, 21 Nov 2016 14:27:23 +0000 (16:27 +0200)
[for 15.05] python: backport version 2.7.12 to CC


Trivial merge