v0.9.8.24-beta2
Merge branch 'stable'

* stable:
  v0.9.8.24-beta2