update
Merge branch 'master' into ja

Conflicts:
	changes.txt
[ja] 2.0.28