Changelog for flock fixes
Merge pull request #438 from staabm/patch-1

Changelog for flock fixes