Merge branch 'master' into IDEA-141111
authorIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Wed, 10 Jun 2015 13:46:37 +0000 (16:46 +0300)
committerIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Wed, 10 Jun 2015 13:46:37 +0000 (16:46 +0300)

Trivial merge