Merge branch 'task'

Conflicts:
	Sip.cpp