<DesktopChanges=None>
Merge remote-tracking branch 'origin/master'

Conflicts:
	Data/Thumbs.db