various updates
Merge branch 'master' of github.com:scbd/absch.cbd.int