Merge remote-tracking branch 'origin/master'
authorIvan Chirkov <ivan.chirkov@jetbrains.com>
Mon, 29 Feb 2016 23:37:00 +0000 (00:37 +0100)
committerIvan Chirkov <ivan.chirkov@jetbrains.com>
Mon, 29 Feb 2016 23:37:00 +0000 (00:37 +0100)

Trivial merge