shared -> master
Merge branch 'master' into osada

Conflicts:
	shared