Upstream

Another trivial one, but it comes handy.