commit 2.8
Squashed 'subtree/' changes from 502b625..eb41ffb

eb41ffb commit 2.7
e4779e0 commit 2.5

git-subtree-dir: subtree
git-subtree-split: eb41ffbdbd88c6c28cf2433f734f54fbb1c6996b
merge conflict