Squash 2.x changes for diff purposes

[frenchy64]

git reset --hard 1.1.x
git checkout master -- src
git add .
git commit -m 'squashed'
git push -f