note: A patch that I add includes diff of 29 files, so it's very big. I decided that I pack them into one file. It should be fed back to the author. PR: 16440 Submitted by: Alexander Langer <alex@cichlids.com>