Merge branch 'py-16643'
authorIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Tue, 18 Aug 2015 15:07:03 +0000 (18:07 +0300)
committerIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Tue, 18 Aug 2015 15:07:03 +0000 (18:07 +0300)

Trivial merge