Bug fixes...
Merge branch 'devel' into debian-devel
4.99.3