Merged latest changes from :testing and :nightly
This is an eierlegendewollmilchsau specfile now.