Merge branch 'release/7.x-0.5' into develop
test cleanup: change group
test cleanup: comment out failing tests
Merge branch 'feature/1083-test' into develop
updated to version 7.x-0.6
Merge branch 'release/7.x-0.6'