Fix a missed rename reference
Merge branch 'my-rpi' into laptop

Conflicts:
	config/muttrc