Merge branch 'python-fixes'
authorAndrey Vlasovskikh <andrey.vlasovskikh@jetbrains.com>
Wed, 27 May 2015 15:17:59 +0000 (18:17 +0300)
committerAndrey Vlasovskikh <andrey.vlasovskikh@jetbrains.com>
Wed, 27 May 2015 15:17:59 +0000 (18:17 +0300)

Trivial merge