Actually update the version
Merge tag '2.6.1' into rpm
Update rpm version