update to 2.6 and logo change
Merge remote-tracking branch 'origin/experimental'