Release 1.1.4
Merge branch '1.1.x'