Tagging version 7.x-0.5.
Merge branch 'release/7.x-0.5' into develop