Merge commit 'c904f90' into complex_components

Conflicts:
	core/pypes/component.py
	core/pypes/scheduler.py
merging complex components