Merge branch 'release/7.x-0.3' into develop
commented out failing test
add include to unit test
updated to version 7.x-0.4
Merge branch 'release/7.x-0.4'