lib: dbsrx2 bugfix
Merge branch 'maint'
Merge branch 'master' into next