More fixes
Merge branch 'refs/heads/f/rpm'

Conflicts:
	docs/scripts/rpm/rpm.sh