* Fixed potential endless recursion introduced by SVN r3444 (patch by Ivan Maguidhir). * Bumped version (2.1.0.svn4).