bump to version 2.60.18
Merge remote-tracking branch 'origin/master' into devel