Fix deploy.
Merge branch '1.1'