could lead to error. Remove sebastia@ from maintainer as per his request. ok sebastia@
Merge some more changes from upstream SVN. ok sebastia@ (maintainer)