Merge branch 'release/2.5.2'
sync changelog with package changelog
make resource_filename work in deb package
Merge data
Merge remote-tracking branch 'upstream/develop' into develop