Merge remote-tracking branch 'origin/master'
authorIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Fri, 21 Aug 2015 15:29:21 +0000 (18:29 +0300)
committerIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Fri, 21 Aug 2015 15:29:21 +0000 (18:29 +0300)

Trivial merge