Squashed 'subtree/' changes from a18ebfa..502b625

502b625 commit 2.5
d73e7bf commit 2.4

git-subtree-dir: subtree
git-subtree-split: 502b62512203b3671c3572245d94b6d98aeed44c
Merge commit '71730c3b89e637be219ff1c8683849f0792f3aba'