6.5v2034
Merge remote-tracking branch 'origin/master'

Conflicts:
	Git-tips
6.5v2212