Merge branch 'master' into lighthouse

# Conflicts:
#	topics/geometry.py