MOAR

Another bug bites the dust + merging the merge. The second one is a variation of "post-merge fix" commits, for some reason I find those very funny.