Prepare 1.1.7/2.1.7 releases
Merge branch '2.0'