I'll merge now, since I know people like to work on Saturdays and no need to hold up a good patch for a small detail;