I have fixed this in trunk now.
For small things like this, you can create a branch, with a date in the name, and fix several things, and propose for a merge after a week, and then create a new branch.
For bigger issues, you should still create one branch per issue.