Git gitbranchmergerebase 09/07/2017

Merge master into branch:

There two commands that can be used to merge changes from master to a branch: