Merge branch 'python-fixes'
authorAndrey Vlasovskikh <andrey.vlasovskikh@jetbrains.com>
Fri, 4 Jul 2014 10:37:44 +0000 (14:37 +0400)
committerAndrey Vlasovskikh <andrey.vlasovskikh@jetbrains.com>
Fri, 4 Jul 2014 10:37:44 +0000 (14:37 +0400)

Trivial merge