Merge branch 'master', remote branch 'origin'
Merge branch 'master', remote branch 'origin'
Merge branch 'master', remote branch 'origin'
Merge branch 'master', remote branch 'origin'
Merge branch 'master', remote branch 'origin'
Merge branch 'master', remote branch 'origin'
Merge remote branch 'origin'
update tests
some work on the refactoring of dammif plugin