on branch master, this commit should be the commit directly following the rebased commits from thing1 branch