Merge pull request #6124 from wigyori/for-15.05-freeradius2