don't just consider build-trigger upstream, but all upstreams (including join)
Merge pull request #1 from ndeloof/master

better upstream/downstream support