Merge branch 'master' into rb-wiederkehrende-rechnungen