No difference from version in main trunk (apart from some debugging code I'd added while helping Jenny/Kathy try and debug resource bundle issues)