building the structure of the repository in the master branch
...
Merge remote-tracking branch 'upstream/master'