Fix several problem
Merge branch '1.0' into 1.1
Merge branch '1.1'