Merged specfile changes from tag Release-0.8.1