最新のberkshelfが入るように調整。
Merge commit 'c4d2641b76567bd7d1e5a9ad9c801d216d7f8733'

Conflicts:
	scripts/prepare.sh
	scripts/setup.sh