Merged and fixed bugs
Merge remote-tracking branch 'origin/upgrade_tracking' into upgrade_tracking

Conflicts:
	CHANGELOG
	VERSION