Merge branch 'IDEA-163243' of https://github.com/zdary/intellij-community
authorEugene Zhuravlev <jeka@intellij.com>
Wed, 2 Nov 2016 15:22:50 +0000 (16:22 +0100)
committerEugene Zhuravlev <jeka@intellij.com>
Wed, 2 Nov 2016 15:22:50 +0000 (16:22 +0100)

Trivial merge