Merge pull request #411 from hynek/master

Add changelog entry for #304