Merge branch 'develop'
Merge branch 'develop'
Change bump to work in release branches
Correct branch comparison
Bumps version number.
Updated changelog
Merge branch 'release-1.0.2'
Merge branch 'master' into develop