Merge release v1.1.1