Ok, I'll test this on my box and then merge in a few minutes.