git: rebase conflicts
git: branching: update remote branch list
Merge branch 'master' into gh-pages