Hi Matt, I do not think we should change anything in a stable branch now. We may consider it for 5.6.1 once we are 200% sure we can back port it to 5.5.
Btw your patch is not windows only but also change the uuid function. Not a bad thing as u never got why we have this modulo anyway :) Cheers, Pierre