from Jaap K svn path=/trunk/; revision=16648
svn path=/trunk/; revision=15897
svn path=/trunk/; revision=12130