Merge branch 'master' into zeising/meson

Author: zeising

.cirrus.yml

@@ -5,8 +5,10 @@ env:
 task:
   freebsd_instance:
     matrix:
-      image: freebsd-12-0-release-amd64
-      image: freebsd-11-2-release-amd64
+      image_family: freebsd-13-0-snap
+      image_family: freebsd-12-1
+      image_family: freebsd-12-0
+      image: freebsd-11-3-stable-amd64-v20190801
   install_script:
     - sed -i.bak -e 's,pkg+http://pkg.FreeBSD.org/\${ABI}/quarterly,pkg+http://pkg.FreeBSD.org/\${ABI}/latest,' /etc/pkg/FreeBSD.conf
     - pkg upgrade -y