Fix for rpm packaging error.
Merge branch 'development'