Merge remote-tracking branch 'origin/master'

Conflicts:
	src/currency_protocol/currency_protocol_defs.h