Prepare 1.1.8/2.1.8 releases
Merge branch '2.0'