updated to version 7.x-1.4
Merge branch 'release/7.x-1.4' into develop