Merge pull request #15485 from calavera/merge_release_v1.8.0

Bump version to 1.8.0 in master