Merge branch 'master' into build_system
[FIXUP] 5.11.rc1: update git specific files

These currently include
 * VERSION.txt
 * package-version.txt
 * checksums.ini