123
Merge remote-tracking branch 'origin/bernard' into bernard

Conflicts:
	hi.txt