shared -> master
Merge branch 'master' into daimar

Conflicts:
	shared