Updating to newer 2.7.4 upstream source
Updating a typo in the changelog
Merge branch 'develop'