Squashed 'subtree/' changes from 35e69c5..f729f1f

f729f1f commit 1.9
61bb4d8 commit 1.8
e611234 commit 1.7
821bf8a commit 1.6
9e9504d commit 1.5
dcafcda Merge commit '4087ab53592234bfa15d958e22bc20bcae4ba7a9'
565f28a commit 1.4
4087ab5 merge conflicts
18800e0 merge conflicts
ecca8ca commit 1.3
183f3a0 commit 1.3
c5a6e41 commit 2.5
3da8fe8 1.2
3566ff8 1.2

git-subtree-dir: subtree
git-subtree-split: f729f1f58ec180881d2d1dc41320b904b69ef79a
commit 2.0
commit 2.3
Squashed 'subtree/' changes from f729f1f..3f63a66

3f63a66 commit 2.1
b6c17f2 commit 2.0

git-subtree-dir: subtree
git-subtree-split: 3f63a66a0f939237aef455fe04308d949018a99e