Release 0.11.5
Merge branch '0.11'