Merge branch 'master' into script_devel to use pkg-config