1.8.8 added
Merge branch '1.8.8'