Merge remote-tracking branch 'origin/master' into amakeev/cmake-iml clion/163.3657
authorAnton Makeev <Anton.Makeev@jetbrains.com>
Wed, 31 Aug 2016 21:12:47 +0000 (23:12 +0200)
committerAnton Makeev <Anton.Makeev@jetbrains.com>
Wed, 31 Aug 2016 21:12:47 +0000 (23:12 +0200)

Trivial merge