Latest shared
Merge branch 'master' into unstable

Conflicts:
	HybridShared