Merge remote-tracking branch 'semifor/exclude-virtual-columns'
Samuel Kaufman [Wed, 20 Sep 2017 20:12:51 +0000 (20:12 +0000)]

Trivial merge