Release 0.11.4
Merge branch '0.11'