Bad merge
Merge branch '1.8'