Conflicts: Changelog.draft.rst docs/MANUAL.rst Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>