Some changes
Merge remote-tracking branch 'pb/master'

Conflicts:
	Sync.pas