Update package_resources library
Merge branch 'master' into dev