Merge branch 'python-fixes'
authorAndrey Vlasovskikh <andrey.vlasovskikh@jetbrains.com>
Wed, 24 Dec 2014 14:02:46 +0000 (17:02 +0300)
committerAndrey Vlasovskikh <andrey.vlasovskikh@jetbrains.com>
Wed, 24 Dec 2014 14:02:46 +0000 (17:02 +0300)

Trivial merge