Prepare 1.1.6/2.1.6 releases
Merge branch '2.0'