by Sebastian Nell (codemanx) This patch contains many changes - mostly to addons committing this correction to trunk.