rebase

Merge master into branch:
09/07/2017 Git gitbranchmergerebase