Merge 1.8.0~pre4 packaging into master