Update 2
Merge branch 'master' of https://github.com/Dingi/GitMergeTestStuff