Merge branch 'master' into core-updates

diff --cc gnu/local.mk
index d4e986c,ea2d650..15c8159
--- 1/gnu/local.mk
--- 2/gnu/local.mk
+++ b/gnu/local.mk
@@@ -591,14 -592,16 +592,16 @@@ dist_patch_DATA =                                               
    %D%/packages/patches/awesome-reproducible-png.patch         \
    %D%/packages/patches/azr3.patch                             \
    %D%/packages/patches/bash-completion-directories.patch      \
+   %D%/packages/patches/bastet-change-source-of-unordered_set.patch    \
    %D%/packages/patches/bazaar-CVE-2017-14176.patch            \
    %D%/packages/patches/beignet-correct-file-names.patch               \
 -  %D%/packages/patches/binutils-aarch64-symbol-relocation.patch       \
    %D%/packages/patches/binutils-loongson-workaround.patch     \
    %D%/packages/patches/blast+-fix-makefile.patch              \
    %D%/packages/patches/boost-fix-icu-build.patch              \
+   %D%/packages/patches/borg-respect-storage-quota.patch               \
    %D%/packages/patches/byobu-writable-status.patch            \
    %D%/packages/patches/cairo-CVE-2016-9082.patch                      \
 +  %D%/packages/patches/cairo-setjmp-wrapper.patch             \
    %D%/packages/patches/calibre-no-updates-dialog.patch                \
    %D%/packages/patches/calibre-use-packaged-feedparser.patch  \
    %D%/packages/patches/catdoc-CVE-2017-11110.patch            \

diff --cc gnu/packages/audio.scm
Simple merge

diff --cc gnu/packages/libreoffice.scm
Simple merge