Merge release v0.11.1