Fix frame layout issue on IME-composition
Revert "Strip non-standard -wait option with /bin/sh. now it doesn't work"

This reverts commit a3e06f5430caac8ac9a300c8ed2975d04c3d54f0.
Update version
Merge branch 'develop'

Conflicts:
	install.rdf