bugfix with scheduler
linked properties fix
Merge remote-tracking branch 'remotes/upstream/master'

Conflicts:
	lib/common.class.php
	modules/objects/objects.class.php