commit 3rd update
Merge remote-tracking branch 'origin/master' into mg-branch

Conflicts:
	mike.txt