fixed a really bad bug... bump to 2.6
bug in c, what do we do???
bug in btn now...
bug in c
Merge branch 'hotfix/2.6'