Commit 8dc194e8 authored by Alexander Dielen's avatar Alexander Dielen

Merge branch 'master' into 'BuildPythonWindows'

# Conflicts:
#   src/Python/Vector.hh
parents f90c6da1 4f209d9f
Pipeline #2809 passed with stage
in 21 minutes and 8 seconds