Merge branch 'release-2018' into master