Merge remote-tracking branch 'origin/master'

Conflicts:
	David.mwb
	David.mwb.bak