Patch #1210242 from Bleeter

"Following on from patch 941731, I've updated for both head and oldstatus. I couldn't submit the patches there, so I've opened this so I can do so here.

As noted in the other tracker entry, I have some testing to do on all known locales so the FAQ can be updated accordingly. I'll submit patches once I've done this check."