New upstream release, updated changelog
Merge pull request #400 from LocutusOfBorg/changelog_updated

Updated changelog (again)