Squashed 'yoink/' changes from 6255293..566afed

566afed renamed the layout combinators

git-subtree-dir: yoink
git-subtree-split: 566afed54c45f0ee09c5b567a3c7f682125dc4c5
Merge commit '1ad88b1c84e9a9b8046497bccc43e2ab727552ae'
renamed layout combinators