Ask dominik
Merge commit '00cb7d0'

Conflicts:
	network_protocol/README.md