Prepare 1.1.1 release
Merge branch '2.0'