Merge branch 'python-fixes'
authorAndrey Vlasovskikh <andrey.vlasovskikh@jetbrains.com>
Mon, 16 Nov 2015 16:33:47 +0000 (19:33 +0300)
committerAndrey Vlasovskikh <andrey.vlasovskikh@jetbrains.com>
Mon, 16 Nov 2015 16:33:47 +0000 (19:33 +0300)

Trivial merge