Merge branch 'hotfix/0.2.3'
Merge branch 'develop'
Merge branch 'master' into release/0.2.4
Version bump.
Merge branch 'release/0.2.4' into develop