shared -> master
Merge branch 'master' into tokuhisa

Conflicts:
	shared