Merge branch 'master' into ronkyo

Conflicts:
	mi/core/instrument/instrument_protocol.py