First non-upstream commit to "our" master branch