Age | Commit message (Expand) | Author |
2022-05-12 | gnu: sshoot: Update to 1.5.1....* gnu/packages/vpn.scm (sshoot): Update to 1.5.1.
[phases]: Delete trailing #t.
{check}: Override phase.
[inputs]: Add python-pyxdg and python-toolrack.
[native-inputs]: Delete python-fixtures, python-pbr and python-testtools. Add
python-pytest and python-pytest-mock.
| Maxim Cournoyer |
2022-02-22 | gnu: n2n: Fix cross-compilation....* gnu/packages/vpn.scm (n2n)[arguments]<#:phases>: Add (or native-inputs
inputs) to SEARCH-INPUT-FILE.
| Nicolas Goaziou |
2022-02-22 | gnu: Add n2n....* gnu/packages/vpn.scm (n2n): New variable.
Signed-off-by: Nicolas Goaziou <mail@nicolasgoaziou.fr>
| Lu Hui |
2022-02-12 | gnu: protonvpn-cli: Remove sanity-check phase....* gnu/packages/vpn.scm (protonvpn-cli)[arguments]: Remove sanity-check
phase.
| Josselin Poiret |
2022-02-12 | gnu: protonvpn-cli: Do not try to wrap the wrapper....* gnu/packages/vpn.scm (protonvpn-cli)[arguments]: Try to wrap the
original program, and not the wrapper, as wrap-program handles that
properly.
| Josselin Poiret |
2022-02-03 | gnu: strongswan: Build with libsoup@2....* gnu/packages/vpn.scm (strongswan)[inputs]: Change from LIBSOUP to
LIBSOUP-MINIMAL-2.
| Marius Bakke |
2022-01-28 | gnu: openconnect-sso: Remove a transitive dependency on QtWebKit....See <https://issues.guix.gnu.org/53289> for more information about this change.
* gnu/packages/vpn.scm (openconnect-sso)[inputs]: Replace python-pyqt with
python-pyqt-without-qtwebkit.
| Leo Famulari |
2021-12-17 | gnu: openvpn: Update to 2.5.5....* gnu/packages/vpn.scm (openvpn): Update to 2.5.5.
| Tobias Geerinckx-Rice |
2021-12-13 | gnu: Remove superfluous "linux-libre-headers" inputs....This input is already propagated from glibc.
* gnu/packages/chromium.scm (ungoogled-chromium)[inputs]: Remove LINUX-LIBRE-HEADERS-5.10.
* gnu/packages/linux.scm (btrfs-progs)[native-inputs]: Likewise.
* gnu/packages/accessibility.scm (brltty)[inputs]: Remove LINUX-LIBRE-HEADERS.
* gnu/packages/graphics.scm (directfb)[inputs]: Likewise.
* gnu/packages/gstreamer.scm (libdc1394)[inputs]: Likewise.
* gnu/packages/linux.scm (python-evdev)[native-inputs]: Likewise.
(bcc, bpftrace)[inputs]: Likewise.
* gnu/packages/networking.scm (lksctp-tools)[inputs]: Likewise.
* gnu/packages/video.scm (tslib)[inputs]: Likewise.
* gnu/packages/web-browsers.scm (links)[native-inputs]: Likewise.
* gnu/packages/cdrom.scm (cdrtools)[inputs]: Likewise.
[arguments]: Adjust accordingly.
* gnu/packages/lirc.scm (lirc)[inputs, arguments]: Likewise.
* gnu/packages/vpn.scm (xl2tpd)[inputs, arguments]: Likewise.
| Marius Bakke |
2021-12-13 | gnu: Further simplify package inputs....This is the result of running:
./pre-inst-env guix style --input-simplification=safe
and manually undoing changes on a dozen of packages to reduce
rebuilds (derivations for emacs, icecat, and libreoffice are unchanged.)
| Ludovic Courtès |
2021-12-13 | gnu: Simplify package inputs....This commit was obtained by running:
./pre-inst-env guix style
without any additional argument.
| Ludovic Courtès |
2021-12-05 | Merge remote-tracking branch 'origin/master' into core-updates-frozen | Ricardo Wurmus |
2021-11-27 | gnu: strongswan: Update to 5.9.4....* gnu/packages/vpn.scm (strongswan): Update to 5.9.4.
[arguments]: Don't explicitly return #t from phases.
[license]: Fix typo.
| Tobias Geerinckx-Rice |
2021-11-17 | Merge branch 'master' into core-updates-frozen | Ludovic Courtès |
2021-11-08 | gnu: packages: Remove last year's deprecations....* gnu/packages/admin.scm (guile3.0-shepherd): Remove variable.
* gnu/packages/benchmark.scm (imb-openmpi): Likewise.
* gnu/packages/boost.scm (boost-with-python3): Likewise.
* gnu/packages/pep.scm (python-pep-adapter)[inputs]: Adjust accordingly.
* gnu/packages/cpp.scm (nlohmann-json-cpp): Likewise.
* gnu/packages/games.scm (openrct2)[inputs]: Adjust accordingly.
* gnu/packages/cups.scm (escpr): Likewise.
* gnu/packages/django.scm (python-django-jsonfield): Likewise.
* gnu/packages/emacs-xyz.scm (emacs-modus-operandi-theme)
(emacs-modus-vivendi-theme): Likewise.
* gnu/packages/engineering.scm (kicad-i18l): Likewise.
* gnu/packages/enlightenment.scm (enlightenment-wayland): Likewise.
* gnu/packages/firmware.scm (opensbi-qemu-virt, opensbi-qemu-sifive-u):
Likewise.
* gnu/packages/fonts.scm (font-gnu-freefont-ttf, font-open-dyslexic):
Likewise.
* gnu/packages/game-development.scm (guile3.0-chickadee)
(python-sge-pygame): Likewise.
* gnu/packages/games.scm (retux)[inputs]: Adjust accordingly.
* gnu/packages/gnome-xyz.scm (numix-theme): Likewise.
* gnu/packages/gnupg.scm (guile3.0-gcrypt): Likewise.
* gnu/packages/gstreamer.scm (gst-transcoder): Likewise.
* gnu/packages/gtk.scm (guile3.0-cairo, guile3.0-present, guile3.0-rsvg):
Likewise.
* gnu/packages/guile-xyz.scm (guile3.0-colorized, guile3.0-commonmark)
(guile3.0-config, guile3.0-email, guile3.0-fibers, guile3.0-gi)
(guile3.0-hall, guile3.0-hashing, guile3.0-haunt, guile3.0-ics)
(guile3.0-irregex, guile3.0-lib, guile3.0-mcron, guile3.0-minikanren)
(guile3.0-ncurses, guile3.0-ncurses/gpm, guile3.0-newt, guile3.0-parted)
(guile3.0-pfds, guile3.0-picture-language, guile3.0-semver)
(guile3.0-simple-zmq, guile3.0-squee, guile3.0-syntax-highlight)
(guile3.0-websocket, guile3.0-wisp, guile3.0-xapian): Likewise.
* gnu/packages/guile.scm (define-deprecated-guile3.0-package)
(guile3.0-json, guile3.0-gdbm-ffi, guile3.0-sqlite3)
(guile3.0-bytestructures, guile3.0-git): Likewise.
* gnu/packages/haskell-apps.scm (ghc-stylish-haskell): Likewise.
* gnu/packages/linux.scm (linux-libre-arm-veyron): Likewise.
* gnu/packages/mail.scm (guile3.0-mailutils): Likewise.
* gnu/packages/monitoring.scm (python2-graphite-web): Likewise.
* gnu/packages/package-management.scm (guile3.0-guix): Likewise.
* gnu/packages/package-management.scm (python-conda): Likewise.
* gnu/packages/phabricator.scm (libphutil): Likewise.
* gnu/packages/plotutils.scm (guile3.0-charting): Likewise.
* gnu/packages/python-xyz.scm (python2-smmap2, python-glances)
(python-smmap2): Likewise.
* gnu/packages/shells.scm (oil-shell): Likewise.
* gnu/packages/sqlite.scm (sqlite-with-column-metadata): Likewise.
* gnu/packages/ssh.scm (guile3.0-ssh): Likewise.
* gnu/packages/terminals.scm (et): Likewise.
* gnu/packages/tls.scm (guile3.0-gnutls): Likewise.
* gnu/packages/vlang.scm (v): Likewise.
* gnu/packages/vpn.scm (wireguard): Likewise.
* gnu/packages/web-browsers.scm (next, sbcl-next): Likewise.
* gnu/packages/xorg.scm (transset-df): Likewise.
| Tobias Geerinckx-Rice |
2021-10-12 | Merge remote-tracking branch 'origin/master' into core-updates-frozen. | Mathieu Othacehe |
2021-10-05 | gnu: openvpn: Update to 2.5.4....* gnu/packages/vpn.scm (openvpn): Update to 2.5.4.
| Tobias Geerinckx-Rice |
2021-10-05 | gnu: wireguard-tools: Fix doc installation....* gnu/packages/vpn.scm (wireguard-tools)[arguments]: Add missing out.
| Tobias Geerinckx-Rice |
2021-10-04 | gnu: wireguard-tools: Update to 1.0.20210914....* gnu/packages/vpn.scm (wireguard-tools): Update to 1.0.20210914.
[arguments]: Don't explicitly return #t from phases.
Re-indent not to exceed 80 columns.
| Tobias Geerinckx-Rice |
2021-07-24 | gnu: Use 'search-input-file' when looking for executables....* gnu/packages/admin.scm (isc-dhcp): Use 'search-input-file' when
looking for executables.
* gnu/packages/audio.scm (ableton-link): Likewise.
* gnu/packages/benchmark.scm (fio): Likewise.
* gnu/packages/bioinformatics.scm (roary): Likewise.
(ngless): Likewise.
* gnu/packages/boost.scm (boost-for-irods): Likewise.
* gnu/packages/bootloaders.scm (grub): Likewise.
(grub-efi): Likewise.
* gnu/packages/chemistry.scm (inchi): Likewise.
* gnu/packages/dictionaries.scm (ding): Likewise.
* gnu/packages/dlang.scm (ldc): Likewise.
* gnu/packages/education.scm (childsplay): Likewise.
* gnu/packages/emacs-xyz.scm (emacs-hyperbole): Likewise.
(emacs-haskell-mode): Likewise.
(emacs-auctex): Likewise.
(emacs-ggtags): Likewise.
(emacs-graphviz-dot-mode): Likewise.
(emacs-flycheck-grammalecte): Likewise.
(emacs-counsel-notmuch): Likewise.
(emacspeak): Likewise.
(emacs-exwm): Likewise.
(emacs-exwm-x): Likewise.
(emacs-treemacs): Likewise.
(emacs-telega): Likewise.
(emacs-exiftool): Likewise.
* gnu/packages/emulators.scm (higan): Likewise.
* gnu/packages/engineering.scm (freehdl): Likewise.
(librepcb): Likewise.
* gnu/packages/entr.scm (entr): Likewise.
* gnu/packages/file-systems.scm (libeatmydata): Likewise.
(xfstests): Likewise.
(mergerfs): Likewise.
(mergerfs-tools): Likewise.
* gnu/packages/finance.scm (monero-gui): Likewise.
* gnu/packages/flashing-tools.scm (flashrom): Likewise.
* gnu/packages/fontutils.scm (fontforge): Likewise.
* gnu/packages/game-development.scm (python2-renpy): Likewise.
* gnu/packages/games.scm (opensurge): Likewise.
(xboard): Likewise.
(hyperrogue): Likewise.
(flare-game): Likewise.
(chessx): Likewise.
* gnu/packages/geo.scm (grass): Likewise.
* gnu/packages/glib.scm (glib): Likewise.
* gnu/packages/gnome.scm (mm-common): Likewise.
(network-manager-openvpn): Likewise.
(network-manager-vpnc): Likewise.
(network-manager-openconnect): Likewise.
(apostrophe): Likewise.
* gnu/packages/gnupg.scm (pius): Likewise.
(jetring): Likewise.
* gnu/packages/gnuzilla.scm (icedove): Likewise.
* gnu/packages/golang.scm (go-1.4): Likewise.
* gnu/packages/graphviz.scm (xdot): Likewise.
* gnu/packages/guile-xyz.scm (jupyter-guile-kernel): Likewise.
* gnu/packages/haskell-xyz.scm (ghc-hindent): Likewise.
* gnu/packages/ibus.scm (ibus): Likewise.
* gnu/packages/image.scm (phockup): Likewise.
* gnu/packages/irc.scm (quassel): Likewise.
* gnu/packages/java.scm (drip): Likewise.
(ant-bootstrap): Likewise.
(tla2tools): Likewise.
* gnu/packages/julia.scm (julia): Likewise.
* gnu/packages/less.scm (lesspipe): Likewise.
* gnu/packages/libreoffice.scm (libreoffice): Likewise.
* gnu/packages/linux.scm (fuse): Likewise.
(lm-sensors): Likewise.
(bluez): Likewise.
(fakeroot): Likewise.
(inputattach): Likewise.
* gnu/packages/lisp-xyz.scm (sbcl-cl-diskspace): Likewise.
* gnu/packages/lisp.scm (lisp-repl-core-dumper): Likewise.
* gnu/packages/lua.scm (fennel): Likewise.
* gnu/packages/lxde.scm (spacefm): Likewise.
* gnu/packages/mail.scm (public-inbox): Likewise.
* gnu/packages/maths.scm (hdf-java): Likewise.
(maxima): Likewise.
(frama-c): Likewise.
* gnu/packages/messaging.scm (libgadu): Likewise.
* gnu/packages/music.scm (denemo): Likewise.
(curseradio): Likewise.
* gnu/packages/netpbm.scm (netpbm): Likewise.
* gnu/packages/networking.scm (blueman): Likewise.
(squid): Likewise.
(aircrack-ng): Likewise.
* gnu/packages/node.scm (node): Likewise.
(node-llparse-frontend-bootstrap): Likewise.
(node-llparse-bootstrap): Likewise.
(llhttp-bootstrap): Likewise.
(node-lts): Likewise.
* gnu/packages/ocaml.scm (ocaml-4.11): Likewise.
(opam): Likewise.
(ocaml-graph): Likewise.
* gnu/packages/orpheus.scm (orpheus): Likewise.
* gnu/packages/password-utils.scm (password-store): Likewise.
* gnu/packages/python.scm (pypy3): Likewise.
* gnu/packages/qt.scm (qt5ct): Likewise.
* gnu/packages/radio.scm (libosmo-dsp): Likewise.
* gnu/packages/ruby.scm (ruby-pandoc-ruby): Likewise.
* gnu/packages/rust.scm (rust-1.30): Likewise.
* gnu/packages/screen.scm (byobu): Likewise.
* gnu/packages/statistics.scm (r-with-tests): Likewise.
* gnu/packages/suckless.scm (surf): Likewise.
* gnu/packages/syndication.scm (gfeeds): Likewise.
* gnu/packages/telephony.scm (mumble): Likewise.
* gnu/packages/terminals.scm (alacritty): Likewise.
* gnu/packages/tex.scm (texlive-bin): Likewise.
* gnu/packages/uml.scm (plantuml): Likewise.
* gnu/packages/version-control.scm (python-git-multimail): Likewise.
(gitolite): Likewise.
(hg-commitsigs): Likewise.
(git-when-merged): Likewise.
(git-imerge): Likewise.
(gita): Likewise.
* gnu/packages/video.scm (you-get): Likewise.
* gnu/packages/vim.scm (eovim): Likewise.
* gnu/packages/virtualization.scm (qemu): Likewise.
(virt-manager): Likewise.
(criu): Likewise.
* gnu/packages/vpn.scm (strongswan): Likewise.
(xl2tpd): Likewise.
* gnu/packages/wm.scm (i3lock-fancy): Likewise.
* gnu/packages/wxwidgets.scm (python-wxpython): Likewise.
(python2-wxpython): Likewise.
* gnu/packages/xdisorg.scm (autorandr): Likewise.
* gnu/packages/xorg.scm (hackneyed-x11-cursors): Likewise.
(v86d): Likewise.
(mkfontdir): Likewise.
(xpra): Likewise.
| Ludovic Courtès |
2021-07-24 | gnu: Use 'search-input-directory' when looking for tzdata....* gnu/packages/backup.scm (duplicity)[arguments]: Use
'search-input-directory' for "share/zoneinfo".
* gnu/packages/bioinformatics.scm (pigx-rnaseq): Likewise.
(pigx-bsseq): Likewise.
* gnu/packages/calcurse.scm (calcurse): Likewise.
* gnu/packages/calendar.scm (date): Likewise.
* gnu/packages/compression.scm (lhasa): Likewise.
* gnu/packages/cran.scm (r-rstan): Likewise.
* gnu/packages/django.scm (python-django): Likewise.
* gnu/packages/dlang.scm (ldc-bootstrap): Likewise.
* gnu/packages/finance.scm (ledger): Likewise.
* gnu/packages/glib.scm (glib): Likewise.
* gnu/packages/golang.scm (go-1.4): Likewise.
(go-1.14): Likewise.
* gnu/packages/kde-frameworks.scm (kcalendarcore): Likewise.
(kdelibs4support): Likewise.
* gnu/packages/kodi.scm (kodi): Likewise.
* gnu/packages/mail.scm (mu): Likewise.
* gnu/packages/perl.scm (perl-libtime-parsedate): Likewise.
* gnu/packages/python-xyz.scm (python-robotframework): Likewise.
(python-dparse): Likewise.
* gnu/packages/rrdtool.scm (rrdtool): Likewise.
* gnu/packages/statistics.scm (r-with-tests): Likewise.
* gnu/packages/vim.scm (vim): Likewise.
* gnu/packages/virtualization.scm (ganeti): Likewise.
* gnu/packages/vpn.scm (strongswan): Likewise.
* gnu/packages/xfce.scm (xfce4-panel): Likewise.
* gnu/packages/mate.scm (libmateweather): Use 'search-input-file' for
"share/zoneinfo/zone.tab".
| Ludovic Courtès |
2021-07-18 | Merge branch 'master' into core-updates | Ludovic Courtès |
2021-07-12 | gnu: strongswan: Update to 5.9.3....* gnu/packages/vpn.scm (strongswan): Update to 5.9.3.
Signed-off-by: Efraim Flashner <efraim@flashner.co.il>
| Domagoj Stolfa |
2021-07-07 | gnu: Add bitmask....* gnu/packages/vpn.scm (bitmask): New variable.
Co-authored-by: jgart <jgart@dismail.de>
| Raghav Gururajan |
2021-06-25 | gnu: strongswan: Invoke absolute file names in ‘ipsec’ launcher....* gnu/packages/vpn.scm (strongswan)[arguments]: Include the ‘ipsec’
launcher script in the 'patch-command-file-names phase.
[inputs]: Add coreutils.
| Tobias Geerinckx-Rice |
2021-06-23 | Merge branch 'master' into core-updates...Conflicts:
gnu/packages/cups.scm
gnu/packages/python-web.scm
gnu/packages/web.scm
guix/build/maven/pom.scm
| Tobias Geerinckx-Rice |
2021-06-20 | gnu: openvpn: Update to 2.5.3....* gnu/packages/vpn.scm (openvpn): Update to 2.5.3.
Signed-off-by: Brice Waegeneire <brice@waegenei.re>
| Solene Rapenne |
2021-06-19 | Merge branch 'master' into core-updates...Note: this merge actually changes the 'curl' and 'python-attrs' derivations,
as part of solving caf4a7a2770ef4d05a6e18f40d602e51da749ddc and
12964df69a99de6190422c752fef65ef813f3b6b respectively.
4604d43c0e (gnu: gnutls@3.6.16: Fix cross-compilation.) was ignored because it
cannot currently be tested.
Conflicts:
gnu/local.mk
gnu/packages/aidc.scm
gnu/packages/boost.scm
gnu/packages/curl.scm
gnu/packages/nettle.scm
gnu/packages/networking.scm
gnu/packages/python-xyz.scm
gnu/packages/tls.scm
| Marius Bakke |
2021-06-19 | gnu: Add missing imports to (gnu packages vpn)....This follows up on c85ed0e758d7fa230c08dba6b95c65ceac098d50.
* gnu/packages/vpn.scm: Import (gnu packages curl), (gnu packages gnome),
and (gnu packages multiprecision).
* gnu/packages/networking.scm: Remove unused
(gnu packages multiprecision) import.
f
| Tobias Geerinckx-Rice |
2021-06-19 | gnu: Move strongswan to (gnu packages vpn)....See <https://logs.guix.gnu.org/guix/2021-06-19.log#015517>.
* gnu/packages/networking.scm (strongswan): Move from here…
* gnu/packages/vpn.scm (strongswan): …to here.
| Tobias Geerinckx-Rice |
2021-06-04 | gnu: wireguard-tools: Set #:sh argument of 'wrap-program'....* gnu/packages/vpn.scm
(wireguard-tools)[arguments]<#:phases>{wrap-wg-quick}:
Set #:sh argument of ‘wrap-program’.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
| Maxime Devos |
2021-06-04 | gnu: protonvpn-cli: Set #:sh argument of 'wrap-program'....* gnu/packages/vpn.scm
(protonvpn-cli)[arguments]<#:phases>{wrap-wrapper}:
Set #:sh argument of ‘wrap-program’.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
| Maxime Devos |
2021-06-04 | gnu: openconnect-sso: Set #:sh argument of 'wrap-program'....* gnu/packages/vpn.scm
(openconnect-sso)[arguments]<#:phases>{wrap-qt-process-path}
Set #:sh argument of ‘wrap-program’.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
| Maxime Devos |
2021-06-04 | gnu: vpnc-scripts: Set #:guile argument of 'wrap-script'....* gnu/packages/vpn.scm
(vpnc-scripts)[arguments]<#:phases>{wrap-scripts}:
Set #:guile argument of ‘wrap-script’.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
| Maxime Devos |
2021-04-27 | gnu: wireguard-tools: Update to 1.0.20210424....* gnu/packages/vpn.scm (wireguard-tools): Update to 1.0.20210424.
| Tobias Geerinckx-Rice |
2021-04-22 | gnu: openvpn: Update to 2.5.2....* gnu/packages/vpn.scm (openvpn): Update to 2.5.2.
| Tobias Geerinckx-Rice |
2021-04-22 | gnu: openconnect-sso: Update to 0.7.3....* gnu/packages/vpn.scm (openconnect-sso): Update to 0.7.3.
| Tobias Geerinckx-Rice |
2021-04-13 | gnu: openconnect-sso: Update to 0.7.2....* gnu/packages/vpn.scm (openconnect-sso): Update to 0.7.2.
[arguments]: Remove 'adjust-package-version-requirements phase.
| Efraim Flashner |
2021-03-29 | gnu: wireguard-tools: Update to 1.0.20210315....* gnu/packages/vpn.scm (wireguard-tools): Update to 1.0.20210315.
| Tobias Geerinckx-Rice |
2021-03-13 | gnu: wireguard-tools: Update to 1.0.20210223....* gnu/packages/vpn.scm (wireguard-tools): Update to 1.0.20210223.
| Tobias Geerinckx-Rice |
2021-03-11 | gnu: openvpn: Update to 2.5.1 [security fixes]....Non-exhaustively, fixes CVE-2020-7224.
* gnu/packages/vpn.scm (openvpn): Update to 2.5.1.
| Léo Le Bouter |
2021-02-15 | gnu: Add openconnect-sso....* gnu/packages/vpn.scm (openconnect-sso): New variable.
| Efraim Flashner |
2021-01-10 | Merge branch 'master' into staging | Efraim Flashner |
2021-01-03 | gnu: wireguard-linux-compat: Update to 1.0.20201221....* gnu/packages/vpn.scm (wireguard-linux-compat): Update to 1.0.20201221.
| Tobias Geerinckx-Rice |
2020-12-29 | Merge branch 'master' into ungrafting | Marius Bakke |
2020-12-24 | gnu: protonvpn-cli: Stop propagating inputs....* gnu/packages/vpn.scm (protonvpn-cli)[inputs]: Add dialog, iproute2, iptables,
ncurses, openvpn, procps, python-requests, and which.
[arguments]: Add a 'wrap-wrapper' phase.
Signed-off-by: Leo Famulari <leo@famulari.name>
| Ryan Prior |
2020-12-21 | Merge branch 'master' into ungrafting | Marius Bakke |
2020-12-20 | gnu: openvpn: Update to 2.4.10....* gnu/packages/vpn.scm (openvpn): Update to 2.4.10.
| Tobias Geerinckx-Rice |
2020-12-20 | gnu: protonvpn-cli: Update to 2.2.6....* gnu/packages/vpn.scm (protonvpn-cli): Update to 2.2.6.
| Tobias Geerinckx-Rice |
2020-12-13 | Merge branch 'master' into ungrafting | Marius Bakke |