Merge branch 'master' into space_docu

# Conflicts:
#	nifty/spaces/rg_space/rg_space.py
4 jobs for space_docu in 6 minutes and 28 seconds (queued for 22 seconds)