Work for data installer.
Merge branch 'master' of
https://nakamura5akihito@github.com/nakamura5akihito/six-vuln.git

Conflicts:
	build.xml