upgrade version and update changes
Merge pull request #261 from allegro/develop

merge with develop
Merge pull request #262 from allegro/release/2.6.0

Release/2.6.0