Merge branch 'PY-3999'
authorIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Fri, 26 Jun 2015 16:44:12 +0000 (19:44 +0300)
committerIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Fri, 26 Jun 2015 16:44:12 +0000 (19:44 +0300)

Trivial merge