P4: Another conflicting edit of bar
Merge remote-tracking branch 'p4gf/master'

Conflicts:
	bar