Merge remote-tracking branch 'remotes/origin/master' into 'docu_power_space'
# Conflicts: # nifty/spaces/lm_space/lm_space.py # nifty/spaces/power_space/power_space.py
# Conflicts: # nifty/spaces/lm_space/lm_space.py # nifty/spaces/power_space/power_space.py