hosaka
Merge branch 'master' into hosaka
shared -> hosaka
Merge branch 'master' into hosaka

Conflicts:
	shared
Merge pull request #1 from white-chocolate/hosaka

Hosaka
Merge remote-tracking branch 'origin/master' into tokuhisa

Conflicts:
	shared