Merge remote-tracking branch 'origin/master'
authorIvan Chirkov <Ivan.Chirkov@jetbrains.com>
Fri, 30 Jan 2015 10:49:03 +0000 (11:49 +0100)
committerIvan Chirkov <Ivan.Chirkov@jetbrains.com>
Fri, 30 Jan 2015 10:49:03 +0000 (11:49 +0100)

Trivial merge