uh, maybe I should just not be allowed to merge code today :)