Release 0.11.6
Merge branch '0.11'