Create branches.md
Updated docs
Merge branch 'master' into master-3.x