Revert "Merge branch 'master' of https://github.com/Dingi/GitMergeTestStuff"

This reverts commit 14efbd8347c665651416bb356151c1e9187ba504, reversing
changes made to b7669d0891d72c21e1b0d713eb89595ad87489d6.
Merge branch 'master' of https://github.com/Dingi/GitMergeTestStuff