v0.11.5
Merge branch 'release/v0.11.5' into develop

* release/v0.11.5:
  v0.11.5