Commit 052d9529 authored by Carsten  Rose's avatar Carsten Rose
Browse files

Merge branch 'master' into corrections

# Conflicts:
#	Documentation/Manual.rst
parents 402b0e3c d52cba21
Pipeline #2540 passed with stages
in 2 minutes and 47 seconds