Merge remote-tracking branch 'origin/master'
authorIvan Chirkov <Ivan.Chirkov@jetbrains.com>
Mon, 8 Jun 2015 09:18:17 +0000 (12:18 +0300)
committerIvan Chirkov <Ivan.Chirkov@jetbrains.com>
Mon, 8 Jun 2015 09:18:17 +0000 (12:18 +0300)

Trivial merge