Based on !140 (merged). /cc @denittis FYI (but I'll probably merge this unreviewed since it's trivial).