work commit
Merge branch 'develop' of github.com:komusubi/rpmbuild into develop

Conflicts:
	SOURCES/deploy.sh
Merge branch 'develop' of github.com:komusubi/rpmbuild into develop
fix bug