Merge branch 'python-fixes'
authorAndrey Vlasovskikh <andrey.vlasovskikh@jetbrains.com>
Fri, 6 Nov 2015 19:51:32 +0000 (22:51 +0300)
committerAndrey Vlasovskikh <andrey.vlasovskikh@jetbrains.com>
Fri, 6 Nov 2015 19:51:32 +0000 (22:51 +0300)

Trivial merge