docker: 1.0.0 -> 1.1.2
Merge branch '3.0' into 3.1