Pre-branch commit.  Trivial changes