Sorry about that, it looks like I missed the second commit when I sent it
out the first time.