Merge remote-tracking branch 'origin/master'
authorMaxim.Mossienko <Maxim.Mossienko@jetbrains.com>
Sat, 19 Jul 2014 22:27:21 +0000 (00:27 +0200)
committerMaxim.Mossienko <Maxim.Mossienko@jetbrains.com>
Sat, 19 Jul 2014 22:27:21 +0000 (00:27 +0200)

Trivial merge