Merge pull request #12085 from wiiaboo/python2