I'm going to take this for a bit to merge in the 3 patches ready to land + update translations prior to the tarball today.
