Updating to version 2.6.
Merge branch 'release/v2.6' into develop