Merge branch 'devel'
log changes