Version bump to 2.6.0
Regenerate gemspec for version 2.6.0
Merge remote-tracking branch 'origin/master'
Regenerate gemspec for version 2.6.0