shared -> master
Merge branch 'master' into hosaka

Conflicts:
	shared