Merge branch 'master' of github.com:mfelsche/crate.web