this adds the remaining patches that Michel Stam sent Signed-off-by: Michel Stam <m.stam@fugro.nl> SVN-Revision: 42918