Franco, can you please make a unified diff (`diff -u`) of your changes, and attach them here ? (The `attach` button is the left-most in the secondary navigation bar. You may have to log in first). In case of trouble with that, make it a comment. The important part to me is to get the patch as `unified diff`, because that makes application much easier. A patch as given in the description I would have to apply very much manually, i.e. search the locations, etc.