Merge branch 'NIFTy_6' into 'new_random'

# Conflicts:
#   nifty6/__init__.py
9 jobs for new_random in 1 minute and 41 seconds (queued for 2 seconds)