Increment version number.
Merge branch 'release/v2.10.4' into develop