Merge branch 'python-fixes'
authorAndrey Vlasovskikh <andrey.vlasovskikh@jetbrains.com>
Tue, 17 Feb 2015 14:42:24 +0000 (17:42 +0300)
committerAndrey Vlasovskikh <andrey.vlasovskikh@jetbrains.com>
Tue, 17 Feb 2015 14:42:24 +0000 (17:42 +0300)

Trivial merge