upgrade to v2.4
Merge branch 'master' into uberspace

* master:
  upgrade to v2.4