Merge branch 'devel' into debian
log changes