Merge branch 'gen-types-from-rt'
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Thu, 25 Feb 2016 10:39:17 +0000 (11:39 +0100)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Thu, 25 Feb 2016 10:39:17 +0000 (11:39 +0100)

Trivial merge