Merge remote-tracking branch 'origin/master'

Conflicts:
	src/python/infant_eeg/main.py