Merge remote-tracking branch 'origin/master' into amakeev/attach-tests
authorAnton Makeev <Anton.Makeev@jetbrains.com>
Thu, 24 Dec 2015 16:43:20 +0000 (17:43 +0100)
committerAnton Makeev <Anton.Makeev@jetbrains.com>
Thu, 24 Dec 2015 16:43:20 +0000 (17:43 +0100)

Trivial merge