Merged revisions 4284-4297 via svnmerge from https://openbabel.svn.sourceforge.net/svnroot/openbabel/openbabel/trunk