Merge branch 'release/7.x-0.13' into develop
Version bumped to 7.x-0.14
Merge branch 'release/7.x-0.14'