Merge branch 'master' into lighthouse2

# Conflicts:
#	topics/light.py -> resolved