Rule 1: if you can use juxt, you use juxt.
Merge remote-tracking branch 'upstream/master'