shared -> master
Merge branch 'master' into tamaizumi

Conflicts:
	shared