[huijzer]

Oh man yes I dislike non-squash merges very much because they make it so hard to go from the Git blame to the pull request discussion