Merge branch 'fr_next' of github.com:jnavila/git