Merge branch 'NIFTy_6' into 'KL_sample_generator'

# Conflicts:
#   nifty6/minimization/metric_gaussian_kl.py
9 jobs for KL_sample_generator in 17 minutes and 5 seconds (queued for 2 seconds)