How are you
Merge branch 'master' into japanese

Conflicts:
	bonjour.py