summaryrefslogtreecommitdiff
path: root/gnu/packages/guile.scm
AgeCommit message (Collapse)Author
2018-03-18gnu: guile-git: Update to 2bb9fbb.Ludovic Courtès
* gnu/packages/guile.scm (guile-git): Update to 2bb9fbb.
2018-03-10gnu: haunt: Update to 0.2.2.David Thompson
* gnu/packages/guile.scm (haunt): Update to 0.2.2.
2018-03-10gnu: guile-syntax-highlight: Update to 0.1.David Thompson
* gnu/packages/guile.scm (guile-syntax-highlight): Update to 0.1.
2018-03-09gnu: 'autoconf-wrapper' is no longer a procedure.Ludovic Courtès
Fixes <https://bugs.gnu.org/30710>. Suggested by Björn Höfling <bjoern.hoefling@bjoernhoefling.de>. * gnu/packages/autotools.scm (autoconf-wrapper): Rename to... (make-autoconf-wrapper): ... this. Add 'properties' field. (autoconf-wrapper): New variable. * gnu/packages/gnunet.scm (guile-gnunet): Adjust accordingly. * gnu/packages/gnupg.scm (signing-party): Likewise. * gnu/packages/guile.scm (guile-ics, guile-bash): Likewise. * gnu/packages/libevent.scm (libuv): Likewise. * gnu/packages/logging.scm (glog): Likewise. * gnu/packages/mail.scm (libetpan): Likewise. * gnu/packages/mate.scm (mate-icon-theme-faenza) (mate-screensaver): Likewise. * gnu/packages/package-management.scm (guix): Likewise. * gnu/packages/sawfish.scm (librep): Likewise. * gnu/packages/video.scm (motion): Likewise. * gnu/packages/zile.scm (zile-on-guile): Likewise.
2018-03-08gnu: guile: Add 2.2.2.Ludovic Courtès
* gnu/packages/guile.scm (guile-2.2.2): New variable.
2018-02-16Merge branch 'master' into core-updatesMark H Weaver
2018-02-16gnu: Use HTTPS for supported nongnu.org home pages.Tobias Geerinckx-Rice
* gnu/packages/acl.scm (acl)[home-page]: Use HTTPS. * gnu/packages/admin.scm (dmidecode)[home-page]: Likewise. * gnu/packages/attr.scm (attr)[home-page]: Likewise. * gnu/packages/audio.scm (lash)[home-page]: Likewise. * gnu/packages/avr.scm (avr-libc)[home-page]: Likewise. * gnu/packages/backup.scm (rdiff-backup, libchop)[home-page]: Likewise. * gnu/packages/compression.scm (fastjar, lzip, lziprecover, atool) (lunzip, clzip, lzlib, plzip)[home-page]: Likewise. * gnu/packages/emacs.scm (geiser, bbdb, m17n-lib, m17n-lib)[home-page]: Likewise. * gnu/packages/flashing-tools.scm (avrdude)[home-page]: Likewise. * gnu/packages/fontutils.scm (libotf)[home-page]: Likewise. * gnu/packages/game-development.scm (gzochi)[home-page]: Likewise. * gnu/packages/games.scm (enigma)[home-page]: Likewise. * gnu/packages/gsasl.scm (libntlm)[home-page]: Likewise. * gnu/packages/gtk.scm (guile-cairo)[home-page]: Likewise. * gnu/packages/guile.scm (guile-reader, guile-lib, guile-json) (guile-redis, g-wrap)[home-page]: Likewise. * gnu/packages/libunwind.scm (libunwind)[home-page]: Likewise. * gnu/packages/lout.scm (lout)[home-page]: Likewise. * gnu/packages/mpd.scm (sonata)[home-page]: Likewise. * gnu/packages/networking.scm (quagga)[home-page]: Likewise. * gnu/packages/ratpoison.scm (ratpoison)[home-page]: Likewise. * gnu/packages/skribilo.scm (skribilo)[home-page]: Likewise. * gnu/packages/telephony.scm (exosip)[home-page]: Likewise. * gnu/packages/texinfo.scm (texi2html)[home-page]: Likewise. * gnu/packages/xdisorg.scm (xbindkeys)[home-page]: Likewise.
2018-02-14gnu: guile-sqlite3: Update to 10c13a7.Ludovic Courtès
* gnu/packages/guile.scm (guile-sqlite3): Update to 10c13a7.
2018-02-11Merge branch 'master' into core-updatesMark H Weaver
2018-02-09gnu: guile-sqlite3: Update to 0.0-3.1cd1dec.Danny Milosavljevic
* gnu/packages/guile.scm (guile-sqlite3): Update to 0.0-3.1cd1dec.
2018-02-09gnu: mcron2: Install files to 'share/guile/site/2.2'.Ludovic Courtès
Reported by Maxim Cournoyer <maxim.cournoyer@gmail.com>. * gnu/packages/guile.scm (mcron2)[arguments]: In 'use-guile-2.2' phase, substitute /share/guile/site/2.0.
2018-02-09Merge branch 'master' into core-updatesMark H Weaver
2018-02-06gnu: guile-sqlite3: Use git-version.Danny Milosavljevic
* gnu/packages/guile.scm [version]: Use git-version.
2018-02-06gnu: guile-sqlite3: Update to 0.0-2.21f35ca.Danny Milosavljevic
* gnu/packages/guile.scm (guile-sqlite3): Update to 0.0-2.21f35ca.
2018-02-01Merge branch 'master' into core-updatesMarius Bakke
2018-01-31gnu: mcron2: Use Guile 2.2 instead of 2.0.Maxim Cournoyer
Motivation: Using Guile 2.2 instead of Guile 2.0 gives us the scripting abilities of Guile 2.2 when writing mcron jobs, such as HTTPS support. * gnu/packages/guile.scm (gnu): Use the srfi-1 module for the alist-delete function. (mcron2)[inputs]: Replace guile-2.0 with guile-2.2. [parallel-build?]: Disable to fix manual page generation. [phases]: Add a "use-guile-2.2" phase so the build system uses Guile 2.2. Replace `system*' with `invoke' in the "bootstrap" phase. Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2018-01-11Merge branch 'master' into core-updatesLeo Famulari
2018-01-11gnu: guile-bytestructures: Update to 1.0.1.amirouche
* gnu/package/guile.scm (guile-bytestructures): Update to 1.0.1. [source]: Use tarball from github instead of git. [build-system]: Use GNU-BUILD-SYSTEM. [arguments]: Remove. [navitve-inputs]: Add PKG-CONFIG. Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2017-12-30gnu: guile@2.2: Fix cross-compilation.Ludovic Courtès
Previously it would fail with: GUILEC language/elisp/boot.go [...] In language/bytecode/spec.scm: 28:15 2 (bytecode->value #vu8(127 69 76 70 1 1 1 255 0 0 0 0 0 0 0 0 3 0 0 0 1 0 0 0 0 0 0 0 52 0 0 0 24 ?) ?) In unknown file: 1 (load-thunk-from-memory #vu8(127 69 76 70 1 1 1 255 0 0 0 0 0 0 0 0 3 0 0 0 1 0 0 0 0 0 0 0 52 0 0 ?)) In ice-9/boot-9.scm: 752:25 0 (dispatch-exception _ _ _) ice-9/boot-9.scm:752:25: In procedure dispatch-exception: In procedure load-thunk-from-memory: No such file or directory * gnu/packages/guile.scm (guile-2.2)[arguments]: New field.
2017-12-19Merge branch 'master' into core-updatesMarius Bakke
2017-12-15gnu: guile-gdbm-ffi: Default to Guile 2.2.Ludovic Courtès
* gnu/packages/guile.scm (guile-gdbm-ffi)[inputs]: Switch to GUILE-2.2. (guile2.0-gdbm-ffi, guile2.2-gdbm-ffi): New variables.
2017-12-13gnu: guile-gdbm-ffi: Install documentation.Tobias Geerinckx-Rice
* gnu/packages/guile.scm (guile-gdbm-ffi)[arguments]: Install README.md and some examples. Tidy up MKDIR-P calls.
2017-12-08gnu: guile: Move Readline support to a separate 'guile-readline' package.Ludovic Courtès
This reduces the closure of Guile from 131 MiB to 116 MiB and removes extra readline/ncurses builds from the bootstrap path. * gnu/packages/guile.scm (guile-2.0)[inputs]: Remove READLINE. (make-guile-readline): New procedure. (guile-readline): New variable. * gnu/system/shadow.scm (default-skeletons): Adjust '.guile' so that it gracefully deals with missing (ice-9 readline).
2017-12-05gnu: guile: Update to 2.2.3.Marius Bakke
* gnu/packages/guile.scm (guile-2.2): Update to 2.2.3. (guile-2.2.3): Remove variable.
2017-12-03gnu: guile-dsv: Update to 0.2.1 & correct sha256.Alex Sassmannshausen
* gnu/packages/guile.scm (guile-dsv): Update to 0.2.1.
2017-12-01gnu: guile-sly: Do not propagate Guile.Ludovic Courtès
* gnu/packages/guile.scm (guile-sly)[propagated-inputs]: Move GUILE-2.2 to... [inputs]: ... here.
2017-12-01gnu: guile: Add version 2.2.3.Ludovic Courtès
* gnu/packages/guile.scm (guile-2.2.3): New variable.
2017-11-27gnu: guile-wisp: Move .go files to 'lib/guile/2.2/site-ccache'.Ludovic Courtès
* gnu/packages/guile.scm (guile-wisp)[arguments]: Remove (system base compile) from #:modules, and (ice-9 rdelim) and (ice-9 popen). In 'install-go-files' phase, invoke 'guild' to compile, and write to lib/guile/X.Y/site-ccache.
2017-11-27gnu: guile-wisp: Switch to Guile 2.2.Ludovic Courtès
* gnu/packages/guile.scm (guile-wisp)[inputs]: Use GUILE-2.2 instead of GUILE-2.0.
2017-11-27gnu: guile-wisp: Update to 0.9.8.Ludovic Courtès
* gnu/packages/guile.scm (guile-wisp): Update to 0.9.8. [inputs]: Remove PYTHON. [native-inputs]: New field. [arguments]: Keep 'install' phase. Add 'install-go-files' phase. Adjust 'substitute-before-config' phase.
2017-11-25gnu: Add guile-dsv.Alex Sassmannshausen
* gnu/packages/guile.scm (guile-dsv): New variable.
2017-11-07gnu: guile-git: Update snapshot.Ludovic Courtès
* gnu/packages/guile.scm (guile-git): Update to commit 951a32c.
2017-10-14gnu: guile-sdl, guile-sly: Switch to Guile 2.2.Ludovic Courtès
* gnu/packages/sdl.scm (guile-sdl)[inputs]: Replace GUILE-2.0 with GUILE-2.2. [arguments]: Add 'skip-cursor-test' phase. * gnu/packages/guile.scm (guile-sly)[propagated-inputs]: Switch to GUILE-2.2.
2017-10-14gnu: guile-sly: Remove 2.0-specific bits.Ludovic Courtès
* gnu/packages/guile.scm (guile-sly)[source](modules, snippet): New fields.
2017-10-10Merge branch 'staging'Marius Bakke
2017-10-08gnu: Add guile-colorized.ng0
* gnu/packages/guile.scm (guile-colorized): New variable. Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2017-10-05Merge branch 'master' into stagingMarius Bakke
2017-10-03Update e-mail for Theodoros Foradis.Theodoros Foradis
* .mailmap: Add entry. * gnu/packages/aspell.scm: Replace theodoros.for@openmailbox.org with current address. * gnu/packages/compression.scm: Likewise. * gnu/packages/electronics.scm: Likewise. * gnu/packages/engineering.scm: Likewise. * gnu/packages/fpga.scm: Likewise. * gnu/packages/graphviz.scm: Likewise. * gnu/packages/guile.scm: Likewise. * gnu/packages/libusb.scm: Likewise. * gnu/packages/maths.scm: Likewise. * gnu/packages/messaging.scm: Likewise. * gnu/packages/uml.scm: Likewise. * gnu/packages/wxwidgets.scm: Likewise. Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2017-09-20gnu: Use 'modify-phases' syntax.Kei Kebreau
* gnu/packages/admin.scm (mingetty, clusterssh, wpa-supplicant-minimal, wpa-supplicant, wakelan, acpica, tree, direvent, dstat)[arguments]: Use 'modify-phases' syntax. * gnu/packages/algebra.scm (arb)[arguments]: Likewise. * gnu/packages/apr.scm (apr-util)[arguments]: Likewise. * gnu/packages/audio.scm (clalsadrv, fluidsynth, faad2, lv2-mda-piano, lv2-mda-epiano, timidity++, vamp, soundtouch, portaudio, rsound, zita-convolver, zita-alsa-pcmi)[arguments]: Likewise. * gnu/packages/backup.scm (rdup, btar)[arguments]: Likewise. * gnu/packages/bioinformatics.scm (bedops, bwa, crossmap, express, flexbar, grit, hisat, ngs-sdk, subread)[arguments]: Likewise. * gnu/packages/bittorrent.scm (transmission)[arguments]: Likewise. * gnu/packages/cdrom.scm (cd-discid)[arguments]: Likewise. * gnu/packages/compression.scm (sharutils)[arguments]: Likewise. * gnu/packages/conky.scm (conky)[arguments]: Likewise. * gnu/packages/databases.scm (bdb, bdb-5.3)[arguments]: Likewise. * gnu/packages/debug.scm (delta, c-reduce)[arguments]: Likewise. * gnu/packages/display-managers.scm (slim)[arguments]: Likewise. * gnu/packages/dns.scm (dnsmasq)[arguments]: Likewise. * gnu/packages/emacs.scm (geiser, emacs-wget, bbdb)[arguments]: Likewise. * gnu/packages/engineering.scm (pcb)[arguments]: Likewise. * gnu/packages/firmware.scm (ath9k-htc-firmware)[arguments]: Likewise. * gnu/packages/flashing-tools.scm (flashrom)[arguments]: Likewise. * gnu/packages/fltk.scm (fltk)[arguments]: Likewise. * gnu/packages/freedesktop.scm (python-pyxdg)[arguments]: Likewise. * gnu/packages/gd.scm (perl-gd)[arguments]: Likewise. * gnu/packages/gkrellm.scm (gkrellm)[arguments]: Likewise. * gnu/packages/glib.scm (glibmm)[arguments]: Likewise. * gnu/packages/gl.scm (glew)[arguments]: Likewise. * gnu/packages/gnome.scm (icon-naming-utils, orbit2, libbonobo, gnome-vfs, libgnome, libbonoboui, goffice-0.8, dconf)[arguments]: Likewise. * gnu/packages/gprolog.scm (gprolog)[arguments]: Likewise. * gnu/packages/gps.scm (gpscorrelate)[arguments]: Likewise. * gnu/packages/graphics.scm (agg)[arguments]: Likewise. * gnu/packages/gtk.scm (ganv, girara, gtksourceview-2, guile-present, python2-pycairo)[arguments]: Likewise. * gnu/packages/guile.scm (guile-1.8)[arguments]: Likewise. * gnu/packages/guile-wm.scm (guile-wm)[arguments]: Likewise. * gnu/packages/hugs.scm (hugs)[arguments]: Likewise. * gnu/packages/hurd.scm (gnumach-headers, hurd-headers, hurd-minimal) [arguments]: Likewise. * gnu/packages/image-viewers.scm (feh, sxiv)[arguments]: Likewise. * gnu/packages/libcanberra.scm (libcanberra)[arguments]: Likewise. * gnu/packages/linux.scm (bridge-utils, iw, fuse, unionfs-fuse/static, lm-sensors, i2c-tools, xsensors, perf, mdadm, libaio, module-init-tools) [arguments]: Likewise. * gnu/packages/lisp.scm (ccl)[arguments]: Likewise. * gnu/packages/lout.scm (lout)[arguments]: Likewise. * gnu/packages/lua.scm (luajit)[arguments]: Likewise. * gnu/packages/machine-learning.scm (shogun)[arguments]: Likewise. * gnu/packages/mail.scm (exim)[arguments]: Likewise. * gnu/packages/man.scm (man-pages, txt2man)[arguments]: Likewise. * gnu/packages/maths.scm (lapack, superlu-dist, openlibm, openspecfun) [arguments]: Likewise. * gnu/packages/messaging.scm (bitlbee)[arguments]: Likewise. * gnu/packages/mp3.scm (libmad, id3lib, mp3info)[arguments]: Likewise. * gnu/packages/music.scm (solfege)[arguments]: Likewise. * gnu/packages/noweb.scm (noweb)[arguments]: Likewise. * gnu/packages/patchutils.scm (patchutils, quilt, colordiff)[arguments]: Likewise. * gnu/packages/pdf.scm (xpdf, zathura-cb, zathura-ps, zathura-djvu, zathura-pdf-poppler, zathura, podofo, fbida)[arguments]: Likewise. * gnu/packages/perl.scm (perl-file-list, perl-test-harness)[arguments]: Likewise. * gnu/packages/photo.scm (gphoto2)[arguments]: Likewise. * gnu/packages/popt.scm (popt)[arguments]: Likewise. * gnu/packages/pretty-print.scm (source-highlight, astyle)[arguments]: Likewise. * gnu/packages/pumpio.scm (pumpa)[arguments]: Likewise. * gnu/packages/python.scm (python-passlib, python-pycrypto, python2-empy, python-sqlalchemy, python-docopt)[arguments]: Likewise. * gnu/packages/rdf.scm (lrdf)[arguments]: Likewise. * gnu/packages/regex.scm (tre)[arguments]: Likewise. * gnu/packages/rrdtool.scm (rrdtool)[arguments]: Likewise. * gnu/packages/ruby.scm (ruby-2.1, ruby-1.8)[arguments]: Likewise. * gnu/packages/sawfish.scm (sawfish)[arguments]: Likewise. * gnu/packages/scheme.scm (racket)[arguments]: Likewise. * gnu/packages/sdl.scm (guile-sdl)[arguments]: Likewise. * gnu/packages/serveez.scm (serveez)[arguments]: Likewise. * gnu/packages/skribilo.scm (skribilo)[arguments]: Likewise. * gnu/packages/smalltalk.scm (smalltalk)[arguments]: Likewise. * gnu/packages/suckless.scm (dmenu, slock)[arguments]: Likewise. * gnu/packages/tcl.scm (expect)[arguments]: Likewise. * gnu/packages/telephony.scm (commoncpp)[arguments]: Likewise. * gnu/packages/textutils.scm (recode, libgtextutils)[arguments]: Likewise. * gnu/packages/time.scm (time)[arguments]: Likewise. * gnu/packages/tor.scm (privoxy)[arguments]: Likewise. * gnu/packages/uucp.scm (uucp)[arguments]: Likewise. * gnu/packages/video.scm (libdvdnav-4)[arguments]: Likewise. * gnu/packages/web-browsers.scm (lynx)[arguments]: Likewise. * gnu/packages/web.scm (tinyproxy)[arguments]: Likewise. * gnu/packages/wicd.scm (wicd)[arguments]: Likewise. * gnu/packages/wm.scm (bspwm)[arguments]: Likewise. * gnu/packages/xdisorg.scm (sxhkd, xcape)[arguments]: Likewise. * gnu/packages/xfce.scm (xfconf)[arguments]: Likewise. * gnu/packages/xfig.scm (transfig)[arguments]: Likewise. * gnu/packages/xorg.scm (imake)[arguments]: Likewise.
2017-09-04gnu: Put autoconf-related phases immediately after the 'unpack phase.Kei Kebreau
* gnu/packages/audio.scm (audacity, rtmidi)[arguments]: Correct phases accordingly. * gnu/packages/bioinformatics.scm (mash, seek, vsearch, emboss, htslib-for-sambamba)[arguments]: Likewise. * gnu/packages/ci.scm (cuirass)[arguments]: Likewise. * gnu/packages/compression.scm (minizip, xdelta)[arguments]: Likewise. * gnu/packages/cpp.scm (libzen)[arguments]: Likewise. * gnu/packages/crypto.scm (opendht)[arguments]: Likewise. * gnu/packages/databases.scm (4store, mdbtools)[arguments]: Likewise. * gnu/packages/debug.scm (stress-make)[arguments]: Likewise. * gnu/packages/dns.scm (dnscrypt-proxy, dnscrypt-wrapper)[arguments]: Likewise. * gnu/packages/emacs.scm (emacs-pdf-tools)[arguments]: Likewise. * gnu/packages/embedded.scm (libjaylink, openocd)[arguments]: Likewise. * gnu/packages/engineering.scm (gerbv)[arguments]: Likewise. * gnu/packages/erlang.scm (erlang)[arguments]: Likewise. * gnu/packages/ftp.scm (weex)[arguments]: Likewise. * gnu/packages/gnome.scm (dia)[arguments]: Likewise. * gnu/packages/gnunet.scm (gnurl, guile-gnunet)[arguments]: Likewise. * gnu/packages/gtk.scm (guile-rsvg, graphene)[arguments]: Likewise. * gnu/packages/guile.scm (guildhall, guile-ics, guile-sqlite3)[arguments]: Likewise. * gnu/packages/ibus.scm (ibus-libpinyin)[arguments]: Likewise. * gnu/packages/irc.scm (weechat)[arguments]: Likewise. * gnu/packages/java.scm (classpath-devel)[arguments]: Likewise. * gnu/packages/libreoffice.scm (libetonyek)[arguments]: Likewise. * gnu/packages/libusb.scm (hidapi)[arguments]: Likewise. * gnu/packages/linux.scm (gpm)[arguments]: Likewise. * gnu/packages/logging.scm (glog)[arguments]: Likewise. * gnu/packages/machine-learning.scm (ghmm)[arguments]: Likewise. * gnu/packages/mail.scm (dovecot-trees, dovecot-libsodium-plugin, esmtp) [arguments]: Likewise. * gnu/packages/messaging.scm (freetalk, libmesode, libstrophe)[arguments]: Likewise. * gnu/packages/microcom.scm (microcom)[arguments]: Likewise. * gnu/packages/ocaml.scm (ocaml-ssl)[arguments]: Likewise. * gnu/packages/parallel.scm (slurm)[arguments]: Likewise. * gnu/packages/pdf.scm (libharu)[arguments]: Likewise. * gnu/packages/samba.scm (cifs-utils)[arguments]: Likewise. * gnu/packages/serialization.scm (msgpack)[arguments]: Likewise. * gnu/packages/shells.scm (scsh)[arguments]: Likewise. * gnu/packages/telephony.scm (libiax2)[arguments]: Likewise. * gnu/packages/textutils.scm (dotconf)[arguments]: Likewise. * gnu/packages/version-control.scm (findnewest)[arguments]: Likewise. * gnu/packages/video.scm (libmediainfo, mediainfo)[arguments]: Likewise.
2017-08-27gnu: Give descriptive file-names for some Git sources.Leo Famulari
* gnu/packages/java.scm (classpath-devel)[source]: Set the file-name. * gnu/packages/guile.scm (guile-for-guile-emacs, guile-syntax-highlight)[source]: Likewise.
2017-08-01Merge branch 'master' into core-updatesMarius Bakke
2017-08-01gnu: artanis: Unbundled guile-json and version according to documentation.Adonay Felipe Nogueira
* gnu/packages/guile.scm (artanis): Unbundled guile-json and version according to documentation. Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2017-07-31gnu: guile-bytestructures: Install .go files to lib/guile/X.Y.Ludovic Courtès
* gnu/packages/guile.scm (guile-bytestructures)[arguments]: Install .go files to OBJECT-DIR, defined as OUT/lib/guile/X.Y/site-ccache.
2017-07-31gnu: guile-git: Skip faulty tests on non-x86_64.Ludovic Courtès
Reported by Mark H Weaver. * gnu/packages/guile.scm (guile-git)[arguments]: Add 'skip-tests' phase unless on x86_64-linux.
2017-07-28gnu: guile-git: Update snapshot.Ludovic Courtès
* gnu/packages/guile.scm (guile-git): Update to commit e156a10. [native-inputs]: Add TEXINFO.
2017-07-28Merge branch 'master' into core-updatesMarius Bakke
2017-07-25gnu: Add guile2.0-git.Ludovic Courtès
* gnu/packages/guile.scm (guile2.0-git): New variable.
2017-07-25gnu: Add guile2.0-bytestructures.Ludovic Courtès
* gnu/packages/patches/guile-bytestructures-name-clash.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/guile.scm (guile-bytestructures)[source]: Use it. [arguments]: Unpack the source. [native-inputs]: New field. (guile2.0-bytestructures): New variable.
2017-07-23Merge branch 'master' into core-updatesLeo Famulari