Merge branch 'nz/remainWhenUnshelve'
authorNadya Zabrodina <Nadya.Zabrodina@jetbrains.com>
Fri, 13 Nov 2015 12:54:15 +0000 (15:54 +0300)
committerNadya Zabrodina <Nadya.Zabrodina@jetbrains.com>
Fri, 13 Nov 2015 12:54:15 +0000 (15:54 +0300)

Trivial merge