Merge branch 'hotfix/0.9.7'
Merge branch 'release/0.9.8'
Merge tag '0.9.8' into develop

0.9.8
Increased development version to next release version 0.9.9