Version 1.1.6
Merge branch '1.1.x'