Merge branch 'master' into PY-9727
authorIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Mon, 14 Dec 2015 14:16:09 +0000 (17:16 +0300)
committerIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Mon, 14 Dec 2015 14:16:09 +0000 (17:16 +0300)

Trivial merge