merge changes from diogenes-0.9.19 branch back into trunk