Diff clamtk-6.16 with a clamtk-6.18-r1

Thank you!