Update documentation according to new branching model.
Merge branch 'hotfix/branch'