Age | Commit message (Expand) | Author |
2021-03-17 | gnu: Use autoconf instead of autoconf-wrapper when possible....This should reduce confusion on when to use the "autoconf"
package and when to use "autoconf-wrapper" instead in
package definitions.
Fixes <https://bugs.gnu.org/46564>.
* gnu/packages/autotools.scm (autoconf-wrapper):
advise to use the "autoconf" package instead where
possible.
* gnu/packages/game-development.scm (tsukundere)[native-inputs]:
use "autoconf" instead of "autoconf-wrapper".
* gnu/packages/gimp.scm
(glimpse)[native-inputs]: likewise.
(gimp-resynthesizer)[native-inputs]: add comment on why
"autoconf-wrapper" is used.
* gnu/packages/gnunet.scm (gnunet)[native-inputs]:
use "autoconf" instead of "autoconf-wrapper".
* gnu/packages/gnupg.scm (signing-party)[native-inputs]:
add comment on why "autoconf-wrapper" is used.
* gnu/packages/guile-xyz.scm
(guile-bash,guile-filesystem,guile-ics,guile-udev)[native-inputs]:
use "autoconf" instead of "autoconf-wrapper".
* gnu/packages/libevent.scm (libuv)[native-inputs]: indicates
"autoconf-wrapper" needs to be replaced with "autoconf"
on core-updates.
* gnu/packages/logging.scm (glog)[native-inputs]: use "autoconf"
instead of "autoconf-wrapper".
* gnu/packages/mail.scm (libetpan)[native-inputs]: likewise.
* gnu/packages/mate.scm
(mate-icon-theme-faenza)[native-inputs]: add comment on why
"autoconf-wrapper" is used.
(mate-screensaver)[native-inputs]: use "autoconf" instead of
"autoconf-wrapper".
* gnu/packages/package-management.scm (guix)[native-inputs]: likewise.
* gnu/packages/sawfish.scm (librep)[native-inputs]: likewise.
* gnu/packages/video.scm (motion)[native-inputs]: likewise.
* gnu/packages/zile.scm (zile)[native-inputs]: likewise.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
| Maxime Devos |
2021-03-11 | gnu: jetring: Update to 0.30....* gnu/packages/gnupg.scm (jetring): Update to 0.30.
| Tobias Geerinckx-Rice |
2021-02-08 | gnu: gnupg: Update to 2.2.27....* gnu/packages/gnupg.scm (gnupg): Update to 2.2.27.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
| Vincent Legoll |
2021-02-01 | gnu: pinentry-rofi: Update to 2.0.3....* gnu/packages/gnupg.scm (pinentry-rofi): Update to 2.0.3.
[arguments]: Add make installcheck phase to verify the installed artifact.
[native-inputs]: Add autoconf-archive.
Signed-off-by: Efraim Flashner <efraim@flashner.co.il>
| Fredrik Salomonsson |
2021-01-28 | gnu: pinentry-rofi: Update to 2.0.2....* gnu/packages/gnupg.scm (pinentry-rofi): Update to 2.0.2.
[arguments]: Simplify the package definition.
Signed-off-by: Nicolas Goaziou <mail@nicolasgoaziou.fr>
| Fredrik Salomonsson |
2021-01-27 | gnu: guile-gcrypt: Refer to the right libgcrypt when cross-compiling....Fixes a regression introduced in
5e163ba00969e7ba05897840a1199b967252b4ae where (gcrypt package-config)
would end up referring to the native libgcrypt.so instead of the target
one.
* gnu/packages/gnupg.scm (guile-gcrypt)[arguments]: Reintroduce
'add-libgrypt-config' phase.
[native-inputs]: Remove LIBGCRYPT.
| Ludovic Courtès |
2021-01-27 | gnu: pinentry-efl: Tweak description....* gnu/packages/gnupg.scm (pinentry-efl)[description]: Use @acronym.
| Tobias Geerinckx-Rice |
2021-01-27 | gnu: pinentry-tty: Update to 1.1.1....* gnu/packages/gnupg.scm (pinentry-tty): Update to 1.1.1.
(pinentry-efl)[source]: Remove patch.
* gnu/packages/patches/pinentry-efl.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove it.
| Tobias Geerinckx-Rice |
2021-01-26 | gnu: guile-gcrypt: Build sequentially and reproducibly....* gnu/packages/gnupg.scm (guile-gcrypt)[arguments]: New field.
| Ludovic Courtès |
2021-01-26 | gnu: guile-gcrypt: Add libgcrypt to 'native-inputs'....* gnu/packages/gnupg.scm (guile-gcrypt)[arguments]: Remove.
[native-inputs]: Add LIBGCRYPT.
| Ludovic Courtès |
2021-01-13 | gnu: Add pinentry-rofi....* gnu/packages/gnupg.scm (pinentry-rofi): New variable.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
| Fredrik Salomonsson |
2021-01-12 | gnu: gpgme: Update to 1.15.1....* gnu/packages/gnupg.scm (gpgme): Update to 1.15.1.
| Tobias Geerinckx-Rice |
2020-11-30 | gnu: signing-party: Update to 2.11....* gnu/packages/gnupg.scm (signing-party): Update to 2.11.
| Tobias Geerinckx-Rice |
2020-11-26 | Merge branch 'master' into staging | Marius Bakke |
2020-11-25 | gnu: gnupg: Update to 2.2.25....* gnu/packages/gnupg.scm (gnupg): Update to 2.2.25.
| Marius Bakke |
2020-11-25 | gnu: libksba: Update to 1.5.0....* gnu/packages/gnupg.scm (libksba): Update to 1.5.0.
| Marius Bakke |
2020-11-25 | gnu: Remove gnupg-2....This package was marked as superseded by gnupg in December 2017.
* gnu/packages/gnupg.scm (gnupg-2): Remove variable.
| Efraim Flashner |
2020-11-19 | Merge branch 'master' into staging | Marius Bakke |
2020-11-18 | gnu: gpgme: Update to 1.15.0....* gnu/packages/gnupg.scm (gpgme): Update to 1.15.0.
| Miguel Ángel Arruga Vivas |
2020-11-17 | gnu: gnupg: Update to 2.2.24....* gnu/packages/gnupg.scm (gnupg): Update to 2.2.24.
| Miguel Ángel Arruga Vivas |
2020-11-17 | gnu: libksba: Update to 1.4.0....* gnu/packages/gnupg.scm (libksba): Update to 1.4.0.
| Miguel Ángel Arruga Vivas |
2020-11-17 | gnu: libassuan: Update to 2.5.4....* gnu/packages/gnupg.scm (libassuan): Update to 2.5.4.
| Miguel Ángel Arruga Vivas |
2020-11-08 | gnu: libgpg-error: Fix cross-compiling to mips64el-linux....* gnu/packages/gnupg.scm (libgpg-error)[arguments]: When cross compiling
create a symlink for mips64el.
| Efraim Flashner |
2020-09-08 | gnu: pinentry: Enable curses fallback....* gnu/packages/gnupg.scm (pinentry-gtk2, pinentry-gnome3, pinentry-qt,
pinentry-efl)[arguments]: Add configure-flag for fallback curses mode.
| Efraim Flashner |
2020-09-03 | gnu: gnupg: Update to 2.2.23 [security fixes]....No CVE assigned yet. See <https://dev.gnupg.org/T5050>.
* gnu/packages/gnupg.scm (gnupg): Update to 2.2.23.
| Tobias Geerinckx-Rice |
2020-08-28 | gnu: gnupg: Update to 2.2.22....* gnu/packages/gnupg.scm (gnupg): Update to 2.2.22.
| Efraim Flashner |
2020-08-28 | gnu: gpgme: Update to 1.14.0....* gnu/packages/gnupg.scm (gpgme): Update to 1.14.0.
[arguments]: Remove field, which included only a 'disable-failing-test' phase
that is no longer needed.
| Mark H Weaver |
2020-05-23 | gnu: guile-gcrypt: Update to 0.3.0....* gnu/packages/gnupg.scm (guile-gcrypt): Update to 0.3.0.
| Ludovic Courtès |
2020-05-13 | mailmap: Update entries for Nikita....* .mailmap: change email and name for Nikita.
* Makefile.am, doc/guix.texi, etc/completion/fish/guix.fish,
gnu/packages/accessibility.scm, gnu/packages/admin.scm,
gnu/packages/audio.scm, gnu/packages/autotools.scm, gnu/packages/cdrom.scm,
gnu/packages/check.scm, gnu/packages/cinnamon.scm,
gnu/packages/compression.scm, gnu/packages/crypto.scm,
gnu/packages/databases.scm, gnu/packages/django.scm, gnu/packages/dns.scm,
gnu/packages/elixir.scm, gnu/packages/emacs-xyz.scm, gnu/packages/emacs.scm,
gnu/packages/enlightenment.scm, gnu/packages/erlang.scm,
gnu/packages/fonts.scm, gnu/packages/fontutils.scm, gnu/packages/forth.scm,
gnu/packages/fvwm.scm, gnu/packages/games.scm, gnu/packages/gl.scm,
gnu/packages/gnome.scm, gnu/packages/gnunet.scm, gnu/packages/gnupg.scm,
gnu/packages/gtk.scm, gnu/packages/guile-wm.scm, gnu/packages/guile-xyz.scm,
gnu/packages/haskell-apps.scm, gnu/packages/haskell-check.scm,
gnu/packages/haskell-crypto.scm, gnu/packages/haskell-xyz.scm,
gnu/packages/haskell.scm, gnu/packages/image-viewers.scm,
gnu/packages/image.scm, gnu/packages/irc.scm, gnu/packages/language.scm,
gnu/packages/libcanberra.scm, gnu/packages/linux.scm,
gnu/packages/lisp-xyz.scm, gnu/packages/lisp.scm, gnu/packages/lolcode.scm,
gnu/packages/lxde.scm, gnu/packages/lxqt.scm, gnu/packages/mail.scm,
gnu/packages/markup.scm, gnu/packages/mate.scm, gnu/packages/maths.scm,
gnu/packages/mc.scm, gnu/packages/messaging.scm, gnu/packages/music.scm,
gnu/packages/ncurses.scm, gnu/packages/networking.scm,
gnu/packages/nickle.scm, gnu/packages/openbox.scm, gnu/packages/pdf.scm,
gnu/packages/perl-check.scm, gnu/packages/perl.scm,
gnu/packages/python-compression.scm, gnu/packages/python-crypto.scm,
gnu/packages/python-web.scm, gnu/packages/python-xyz.scm,
gnu/packages/python.scm, gnu/packages/qt.scm, gnu/packages/ruby.scm,
gnu/packages/rust.scm, gnu/packages/scheme.scm,
gnu/packages/serialization.scm, gnu/packages/shells.scm,
gnu/packages/ssh.scm, gnu/packages/suckless.scm, gnu/packages/tbb.scm,
gnu/packages/telephony.scm, gnu/packages/text-editors.scm,
gnu/packages/textutils.scm, gnu/packages/time.scm, gnu/packages/tls.scm,
gnu/packages/tor.scm, gnu/packages/version-control.scm,
gnu/packages/video.scm, gnu/packages/vim.scm, gnu/packages/web.scm,
gnu/packages/wm.scm, gnu/packages/xdisorg.scm, gnu/packages/xfce.scm,
gnu/packages/xml.scm, gnu/packages/xorg.scm, gnu/services/certbot.scm,
gnu/services/desktop.scm, gnu/services/version-control.scm,
gnu/services/web.scm, guix/import/hackage.scm, guix/licenses.scm: Likewise.
Signed-off-by: Efraim Flashner <efraim@flashner.co.il>
| nikita |
2020-04-11 | gnu: libgcrypt: Fix cross-compilation....This works around
/gnu/store/pwcp239kjf7lnj5i4lkdzcfcxwcfyk72-bash-minimal-5.0.16/bin/bash ../libtool --tag=CC --mode=link i586-pc-gnu-gcc -I/gnu/store/8x9dhckldm6iy1digklfanmvdaizq11f-libgpg-error-1.37/include -g -O2 -fvisibility=hidden -fno-delete-null-pointer-checks -Wall -o mpicalc mpicalc-mpicalc.o libgcrypt.la -L/gnu/store/8x9dhckldm6iy1digklfanmvdaizq11f-libgpg-error-1.37/lib -lgpg-error
i586-pc-gnu-ld: ./.libs/libgcrypt.so: undefined reference to `_gcry_mpih_lshift'
i586-pc-gnu-ld: ./.libs/libgcrypt.so: undefined reference to `_gcry_mpih_add_n'
i586-pc-gnu-ld: ./.libs/libgcrypt.so: undefined reference to `_gcry_mpih_addmul_1'
i586-pc-gnu-ld: ./.libs/libgcrypt.so: undefined reference to `_gcry_mpih_submul_1'
i586-pc-gnu-ld: ./.libs/libgcrypt.so: undefined reference to `_gcry_mpih_mul_1'
i586-pc-gnu-ld: ./.libs/libgcrypt.so: undefined reference to `_gcry_mpih_sub_n'
i586-pc-gnu-ld: ./.libs/libgcrypt.so: undefined reference to `_gcry_mpih_rshift'
* gnu/packages/gnupg.scm (libgcrypt)[arguments]: Disable assembly when
cross-compiling.
| Jan (janneke) Nieuwenhuizen |
2020-03-30 | Merge branch 'master' into core-updates... Conflicts:
gnu/packages/admin.scm
gnu/packages/commencement.scm
gnu/packages/guile.scm
gnu/packages/linux.scm
gnu/packages/package-management.scm
gnu/packages/pulseaudio.scm
gnu/packages/web.scm
| Marius Bakke |
2020-03-29 | gnu: GnuPG: Really use ~/.guix-profile/bin/pinentry by default....Fixes <https://bugs.gnu.org/24076>.
* gnu/packages/patches/gnupg-default-pinentry.patch: New file. Use $HOME to find
the user's Guix profile and installed pinentry.
* gnu/local.mk (dist_patch_DATA): Add the patch.
* gnu/packages/gnupg.scm (gnupg)[source]: Use it.
| Leo Famulari |
2020-03-28 | Revert "gnu: gnupg: Use ~/.guix-profile/bin/pinentry by default."...This commit didn't work:
https://issues.guix.gnu.org/issue/24076#13
This reverts commit c7af9d0b5ebaa1fdb08ff5d8a56004998bcd8103.
| Leo Famulari |
2020-03-27 | Merge branch 'master' into core-updates... Conflicts:
gnu/packages/icu4c.scm
gnu/packages/man.scm
gnu/packages/python-xyz.scm
guix/scripts/environment.scm
guix/scripts/pack.scm
guix/scripts/package.scm
guix/scripts/pull.scm
guix/store.scm
| Marius Bakke |
2020-03-26 | gnu: gnupg: Use ~/.guix-profile/bin/pinentry by default....Fixes <https://bugs.gnu.org/24076>.
Reported by Danny Milosavljevic <dannym@scratchpost.org>.
* gnu/packages/patches/gnupg-default-pinentry.patch: New file.
* gnu/packages/gnupg.scm (gnupg)[source]: Use it.
* gnu/local.mk (dist_patch_DATA): Add it.
| Ludovic Courtès |
2020-03-21 | Merge branch 'master' into core-updates | Marius Bakke |
2020-03-21 | gnu: gpgme: Fix build....Reported by joshuaBPMan on #guix.
* gnu/packages/gnupg.scm (gpgme)[arguments]: Add ‘disable-failing-test’ phase.
| Tobias Geerinckx-Rice |
2020-03-21 | gnu: gnupg: Update to 2.2.20 [security fix]....* gnu/packages/gnupg.scm (gnupg): Update to 2.2.20.
| Tobias Geerinckx-Rice |
2020-03-19 | gnu: gpa: Add phase wrap-program....Fixes <https://bugs.gnu.org/36109>
* gnu/packages/gnupg.scm (gpa)[arguments]: Add phase wrap-program.
Signed-off-by: Marius Bakke <mbakke@fastmail.com>
| Brice Waegeneire |
2020-03-17 | gnu: guile-gcrypt: Use the correct Guile version....This is a follow-up to commit b6bee63bed4f013064c0d902e7c8b83ed7514ade.
* gnu/packages/gnupg.scm (guile-gcrypt)[native-inputs]: Remove GUILE-2.2. Add
GUILE-3.0.
(guile2.2-gcrypt)[native-inputs]: Adjust accordingly.
| Marius Bakke |
2020-03-16 | gnu: Default to Guile 3.0....This patch changes three things:
1. package derivations are built using Guile 3.0;
2. 'gexp->derivation' defaults to Guile 3.0;
3. "guile3.0-" packages are deprecated aliases for the regular
package, which now depends on Guile 3.0; "guile2.2-" packages are
introduced; "guile-next" is renamed to "guile".
* gnu/packages/guile.scm (guile-2.0/fixed): Remove.
(guile-3.0/fixed): New variable.
(package-for-guile-3.0): Remove.
(package-for-guile-2.2): New variable.
(define-deprecated-guile3.0-package): New macro.
(guile-3.0)[name]: Change to "guile".
(guile-json-3)[native-inputs, inputs]: New fields.
(guile2.2-json): New variable.
(guile3.0-json): Deprecate.
(guile-gdbm-ffi)[native-inputs]: Switch to GUILE-3.0.
(guile2.2-gdbm-ffi): New variable.
(guile3.0-gdbm-ffi): Deprecate.
(guile-sqlite3): Switch to GUILE-3.0.
(guile2.2-sqlite3): New variable.
(guile3.0-sqlite3): Deprecate.
(guile-bytestructures): Switch to GUILE-3.0.
(guile2.2-bytestructures): New variable.
(guile3.0-bytestructures): Deprecate.
(guile-git): Switch to GUILE-3.0.
(guile2.2-git): New variable.
(guile3.0-git): Deprecate.
(guile-2.2/bug-fix):
* gnu/packages/ci.scm (cuirass): Switch to GUILE-3.0.
* gnu/packages/emacs-xyz.scm (emacs-guix): Switch to GUILE-3.0.
* gnu/packages/gtk.scm (guile-cairo)[arguments]: New field.
Switch to GUILE-3.0.
(guile2.2-cairo): New variable.
(guile3.0-cairo): Deprecate.
(guile-rsvg): Switch to GUILE-3.0.
(guile2.2-cairo): New variable.
(guile3.0-cairo): Deprecate.
(guile-present): Switch to GUILE-3.0.
(guile2.2-present): New variable.
(guile3.0-present): Deprecate.
(guile-gnome)[propagated-inputs]: Use GUILE2.2-CAIRO and GUILE2.2-LIB.
* gnu/packages/guile-xyz.scm (guile-fibers)[arguments]: Add #:configure-flags.
Switch to GUILE-3.0.
(guile2.2-fibers): New variable.
(guile3.0-fibers): Deprecate.
(guile-syntax-highlight): Switch to GUILE-3.0.
(guile2.2-syntax-highlight): New variable.
(guile3.0-syntax-highlight): Deprecate.
(guile-colorized): Switch to GUILE-3.0.
(guile2.2-colorized): New variable.
(guile3.0-colorized): Deprecate.
(guile-pfds): Switch to GUILE-3.0.
(guile2.2-pfds): New variable.
(guile3.0-pfds): Deprecate.
(guile-simple-zmq): Switch to GUILE-3.0.
(guile2.2-simple-zmq): New variable.
(guile3.0-simple-zmq): Deprecate.
(guile-newt): Switch to GUILE-3.0.
(guile2.2-newt): New variable.
(guile3.0-newt): Deprecate.
(guile-parted): Switch to GUILE-3.0.
(guile2.2-parted): New variable.
(guile3.0-parted): Deprecate.
(guile-config): Switch to GUILE-3.0.
(guile2.2-config): New variable.
(guile3.0-config): Deprecate.
(guile-hall): Switch to GUILE-3.0.
(guile2.2-hall): New variable.
(guile3.0-hall): Deprecate.
(guile-ics): Switch to GUILE-3.0.
(guile2.2-ics): New variable.
(guile3.0-ics): Deprecate.
(guile-wisp)[arguments]: Add 'support-guile-3.0' phase.
Switch to GUILE-3.0.
(guile2.2-wisp): New variable.
(guile3.0-wisp): Deprecate.
(guile-lib): Switch to GUILE-3.0.
(guile2.2-lib): New variable.
(guile3.0-lib): Deprecate.
(guile-minikanren): Switch to GUILE-3.0.
(guile2.2-minikanren): New variable.
(guile3.0-minikanren): Deprecate.
(guile-irregex): Switch to GUILE-3.0.
(guile2.2-irregex): New variable.
(guile3.0-irregex): Deprecate.
(haunt): Switch to GUILE-3.0, and remove GUILE-READER.
(guile2.2-haunt): New variable.
(guile3.0-haunt): Deprecate.
(guile-commonmark): Switch to GUILE-3.0.
(guile2.2-commonmark): New variable.
(guile3.0-commonmark): Deprecate.
(mcron): Switch to GUILE-3.0.
(guile2.0-mcron): New variable.
(guile3.0-mcron): Deprecate.
(guile-picture-language): Switch to GUILE-3.0.
(guile2.2-picture-language): New variable.
(guile3.0-picture-language): Deprecate.
(guile-gi): Switch to GUILE-3.0.
(guile2.2-gi): New variable.
(guile3.0-gi): Deprecate.
(guile-hashing): Switch to GUILE-3.0.
(guile2.2-hashing): New variable.
(guile3.0-hashing): Deprecate.
* gnu/packages/package-management.scm (guix): Switch to GUILE-3.0.
(guile2.2-guix): New variable.
(guile3.0-guix): Deprecate.
(gwl): Replace "guile3.0-" with "guile-".
(guix-jupyter)[source]: Adjust for Guile 3.0.
Switch to GUILE-3.0.
* gnu/packages/ssh.scm (guile-ssh): Switch to GUILE-3.0.
(guile2.2-ssh): New variable.
(guile3.0-ssh): Deprecate.
* gnu/packages/admin.scm (shepherd): Switch to GUILE-3.0.
(guile2.2-shepherd): New variable.
(guile3.0-shepherd): Deprecate.
* gnu/packages/mail.scm (mailutils): Switch to GUILE-3.0.
(guile2.2-mailutils): New variable.
(guile3.0-mailutils): Deprecate.
* gnu/packages/plotutils.scm (guile-charting): Switch to GUILE-3.0.
(guile2.2-charting): New variable.
(guile3.0-charting): Deprecate.
* gnu/packages/version-control.scm (libgit2): Switch to GUILE-3.0.
* gnu/packages/vpn.scm (vpnc-scripts): Switch to GUILE-3.0.
* gnu/packages/web.scm (guix-data-service): Switch to GUILE-3.0.
(hpcguix-web): Switch to GUILE-3.0.
* guix/self.scm (specification->package): Refer to the "guile-" variants
instead of "guile3.0-".
* guix/gexp.scm (default-guile): Change to GUILE-3.0.
* build-aux/build-self.scm (build): #:guile-version defaults to "3.0".
* gnu/packages/commencement.scm (guile-final): Base on GUILE-3.0/FIXED.
| Ludovic Courtès |
2020-03-04 | Merge branch 'master' into core-updates | Marius Bakke |
2020-02-23 | gnu: jetring: Update to 0.29....* gnu/packages/gnupg.scm (jetring): Update to 0.29.
[source]: Download using git-fetch.
| Efraim Flashner |
2020-02-20 | gnu: guile-gcrypt: Use git-file-name...* gnu/packages/gnupg.scm (guile-gcrypt): Use git-file-name.
| Jakub Kądziołka |
2020-02-20 | gnu: guile2.0-gcrypt: Don't use guile-2.2....* gnu/packages/gnupg.scm (guile2.0-gcrypt)[native-inputs]: Replace guile
with guile-2.0.
| Efraim Flashner |
2020-02-20 | gnu: guile3.0-gcrypt: Fix compilation....* gnu/packages/gnupg.scm (guile3.0-gcrypt)[native-inputs]: Replace guile
with guile-next.
| Efraim Flashner |
2020-02-15 | gnu: libgpg-error: Update to 1.37....* gnu/packages/patches/libgpg-error-gawk-compat.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/gnupg.scm (libgpg-error): Update to 1.37.
[source](modules, patches): Remove.
| Marius Bakke |
2019-12-31 | Merge remote-tracking branch 'master' into core-updates. | Mathieu Othacehe |
2019-12-15 | gnu: guile-gcrypt: Update to 0.2.1....* gnu/packages/gnupg.scm (guile-gcrypt): Update to 0.2.1.
| Ludovic Courtès |
2019-12-12 | Merge remote-tracking branch 'origin/master' into core-updates | Efraim Flashner |