Commit graph

375 commits

Author SHA1 Message Date
Ludovic Courtès
2bc8b2af89
gnu: guile-cairo: Update to 1.10.0.
* gnu/packages/gtk.scm (guile-cairo): Update to 1.10.0.
[source]: Add 'snippet'.
[arguments]: Remove.
2018-10-02 23:08:30 +02:00
Marius Bakke
c1d59b3c2a
gnu: enchant: Update to 2.2.3.
* gnu/packages/enchant.scm (enchant): Update to 2.2.3.
[arguments]: Add "--enable-relocatable" to #:configure-flags.
[native-inputs]: Add UNITTEST-CPP.
(enchant-1.6): New public variable.
* gnu/packages/fcitx.scm (fcitx)[inputs]: Change ENCHANT to ENCHANT-1.6.
* gnu/packages/gnome.scm (gspell): Likewise.
* gnu/packages/mate.scm (pluma): Likewise.
* gnu/packages/gtk.scm (gtkspell3)[propagated-inputs]: Likewise.
[inputs]: Remove duplicate ENCHANT.
2018-09-26 00:33:01 +02:00
Mădălin Ionel Patrașcu
57d70dbabc
gnu: Add yad.
* gnu/packages/gtk.scm (yad): New variable.

Signed-off-by: Ricardo Wurmus <rekado@elephly.net>
2018-09-10 14:45:15 +02:00
Ludovic Courtès
b290a631a0
gnu: guile-present: Install .go files to libdir.
* gnu/packages/plotutils.scm (guile-present)[source](modules, snippet):
Remove.
2018-09-06 10:49:42 +02:00
Marius Bakke
7693f678d1
gnu: pango: Replace with 1.42.4.
Fixes <https://bugs.gnu.org/32594>.

* gnu/packages/gtk.scm (pango)[replacement]: New field.
(pango-1.42.4): New public variable.
2018-08-30 18:57:10 +02:00
Tobias Geerinckx-Rice
24d6cc1d59
gnu: Use HTTPS for gtk.org.
* gnu/packages/gimp.scm (babl)[source]: Use HTTPS for ftp.gtk.org.
* gnu/packages/gnome.scm (rest)[home-page]: Use HTTPS for www.gtk.org.
* gnu/packages/gtk.scm (gtk+-2, gtk-doc)[home-page]: Likewise.
2018-08-17 13:13:10 +02:00
Tobias Geerinckx-Rice
9aba9b1278
Migrate search.cpan.org home pages to metacpan.org.
The venerable search.cpan.org has retired[0].

[0]: https://log.perl.org/2018/05/goodbye-search-dot-cpan-dot-org.html

* guix/import/cpan.scm (cpan-home): Generate metacpan.org home page URIs.
Update all previously generated ones in (gnu packages) to their
canonical new homes.
2018-08-11 17:22:31 +02:00
Tobias Geerinckx-Rice
da13cc2ebb
gnu: gtksourceview: Update to 3.24.8.
* gnu/packages/gtk.scm (gtksourceview): Update to 3.24.8.
2018-08-11 05:50:37 +02:00
Marius Bakke
a167873c67
Merge branch 'master' into staging 2018-06-26 13:51:26 +02:00
Danny Milosavljevic
9c708566a2
gnu: gtk-doc: Don't propagate python-six.
* gnu/packages/gtk.scm (gtk-doc)[propagated-inputs]: Remove python-six.
[inputs]: Add python-six.
2018-06-25 21:49:07 +02:00
Ricardo Wurmus
d86a7c647d
gnu: gtk-doc: Wrap executables.
* gnu/packages/gtk.scm (gtk-doc)[arguments]: Add phase "wrap-executables".
2018-06-24 17:35:31 +02:00
Danny Milosavljevic
36ba88da4a
gnu: gtk-doc: Update to 1.27.
* gnu/packages/gtk.scm (gtk-doc)[source]: Update to 1.27.
[arguments]<#:phases>[patch-gtk-doc-scan]: New phase.
[arguments]<#:phases>[patch-test-out]: New phase.
[propagated-inputs]: Add python-six.
2018-06-24 03:55:09 +02:00
Tobias Geerinckx-Rice
0d0252e457
gnu: Use HTTPS for drobilla.net URIs.
* gnu/packages/audio.scm (jalv, lilv, patchage, raul, raul-devel)
(sratom, suil)[source, home-page]: Use HTTPS.
* gnu/packages/gtk.scm (ganv, ganv-devel)[source, home-page]: Likewise.
* gnu/packages/music.scm (ingen)[source, home-page]: Likewise.
* gnu/packages/rdf.scm (serd, sord)[source, home-page]: Likewise.
2018-06-22 22:00:24 +02:00
Marius Bakke
6969c4de44
Merge branch 'master' into staging 2018-06-18 15:29:38 +02:00
Tobias Geerinckx-Rice
0b5c16c07f
Fix typo in (gnu packages gtk) header.
* gnu/packages/gtk.scm: Fix ‘Coypright’ typo.
2018-06-14 04:30:50 +02:00
Marius Bakke
a032b4454b
Merge branch 'master' into staging 2018-06-11 23:52:15 +02:00
Tobias Geerinckx-Rice
bba29e106b
gnu: girara: Update to 0.2.9.
* gnu/packages/gtk.scm (girara): Update to 0.2.9.
[build-system]: Switch to Meson build system.
[arguments]: Trim accordingly.
2018-05-01 07:13:37 +02:00
Mark H Weaver
f0ae90cbbb
Merge branch 'master' into core-updates 2018-04-30 16:48:15 -04:00
Marius Bakke
d54303215e
gnu: gtk+: Update to 3.22.30.
* gnu/packages/gtk.scm (gtk+): Update to 3.22.30.
2018-04-30 19:37:53 +02:00
Marius Bakke
5d904d63f4
Merge branch 'master' into staging 2018-04-16 18:15:28 +02:00
Marius Bakke
73a118bdc5
gnu: gdk-pixbuf: Update to 2.36.12.
* gnu/packages/gtk.scm (gdk-pixbuf): Update to 2.36.12.
2018-04-15 14:45:56 +02:00
Marius Bakke
f6a6a050ea
gnu: atk: Update to 2.28.1.
* gnu/packages/gtk.scm (atk): Update to 2.28.1.
2018-04-15 14:45:56 +02:00
Mark H Weaver
df17d50805
gnu: guile-rsvg: Restore custom bootstrap phase.
This fixes a regression introduced in commit
189be331ac.

* gnu/packages/gtk.scm (guile-rsvg)[arguments]: Restore the custom bootstrap
phase that was in place prior to commit 189be33, but use invoke.
2018-04-10 00:45:07 -04:00
Arun Isaac
6009cdb4e3
gnu: python-pycairo: Update to 1.16.3.
* gnu/packages/gtk.scm (python-pycairo): Update to 1.16.3.
[source]: Remove patch.
[build-system]: Switch to python-build-system.
[native-inputs]: Remove python-waf.
[home-page]: Use HTTPS URI.
* gnu/packages/patches/pycairo-wscript.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Unregister it.
2018-03-31 00:29:35 +05:30
Marius Bakke
5576cfabf3
Merge branch 'master' into core-updates 2018-03-29 17:34:41 +02:00
Danny Milosavljevic
cd49e4789a
gnu: gtkspell3: Add enchant.
* gnu/packages/gtk.scm (gtkspell3)[native-inputs]: Add enchant.
2018-03-25 17:00:37 +02:00
Mark H Weaver
f9b282f484
gnu: at-spi2-atk: Use invoke.
* gnu/packages/gtk.scm (at-spi2-atk)[arguments]: Use invoke.
2018-03-23 05:00:14 -04:00
Mark H Weaver
122ad429dc
gnu: at-spi2-core: Use invoke.
* gnu/packages/gtk.scm (at-spi2-core)[arguments]: Use invoke.
2018-03-23 05:00:08 -04:00
Mark H Weaver
31ca09011a
gnu: gtk+@2: Return #t from all phases.
* gnu/packages/gtk.scm (gtk+-2)[arguments]: Return #t from
the 'disable-tests' phase.
2018-03-23 04:42:19 -04:00
Mark H Weaver
0c5c788fad
gnu: gdk-pixbuf+svg: Use invoke.
* gnu/packages/gtk.scm (gdk-pixbuf+svg): Use invoke in
the 'register-svg-loader' phase.
2018-03-23 04:41:55 -04:00
Marius Bakke
e7a5d40e24
gnu: gtk+: Update to 3.22.29.
* gnu/packages/gtk.scm (gtk+): Update to 3.22.29.
2018-03-22 15:04:10 +01:00
Mark H Weaver
ac21be848a
Merge branch 'master' into core-updates 2018-03-20 14:22:06 -04:00
ng0
4a78fd4617
Correct name and Email for ng0.
* .mailmap: Correct name and Email for ng0.
* 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/emacs.scm, gnu/packages/enlightenment.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/gnuzilla.scm,
gnu/packages/gtk.scm, gnu/packages/guile-wm.scm,
gnu/packages/guile.scm, gnu/packages/haskell-check.scm,
gnu/packages/haskell-crypto.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.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-crypto.scm, gnu/packages/python-web.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: Tobias Geerinckx-Rice <me@tobias.gr>
2018-03-20 17:17:58 +01:00
Marius Bakke
7ace97395f
Merge branch 'master' into staging 2018-03-18 01:09:25 +01:00
Marius Bakke
caf90259fc
gnu: Switch from xextproto to xorgproto.
* gnu/packages/enlightenment.scm (efl)[inputs]: Remove XEXTPROTO.
* gnu/packages/mate.scm (mate-control-center, mate-screensaver,
mate-utils)[native-inputs]: Likewise.
* gnu/packages/xdisorg.scm (xautomation)[inputs]: Likewise.
* gnu/packages/gtk.scm (cairo)[inputs]: Replace XEXTPROTO with XORGPROTO.
* gnu/packages/ratpoison.scm (ratpoison)[inputs]: Likewise.
* gnu/packages/xnee.scm (xnee)[inputs]: Likewise.
* gnu/packages/xorg.scm (libdmx, libwindowswm, fixesproto, libxext,
libx11)[inputs]: Likewise.
(xorg-server): [inputs]: Remove XEXTPROTO.
(libxext)[properties]: Mark as superseded by XORGPROTO.
2018-03-18 00:19:54 +01:00
Mark H Weaver
9f388b1ee1
Merge branch 'master' into core-updates 2018-03-17 01:18:37 -04:00
Mark H Weaver
6cbee49d66
gnu: All snippets report errors using exceptions, else return #t.
* gnu/packages/admin.scm, gnu/packages/algebra.scm, gnu/packages/audio.scm,
gnu/packages/backup.scm, gnu/packages/base.scm,
gnu/packages/bioinformatics.scm, gnu/packages/cdrom.scm,
gnu/packages/chez.scm, gnu/packages/code.scm, gnu/packages/compression.scm,
gnu/packages/cross-base.scm, gnu/packages/crypto.scm, gnu/packages/cups.scm,
gnu/packages/databases.scm, gnu/packages/dns.scm, gnu/packages/emacs.scm,
gnu/packages/emulators.scm, gnu/packages/engineering.scm,
gnu/packages/enlightenment.scm, gnu/packages/fpga.scm,
gnu/packages/freedesktop.scm, gnu/packages/ftp.scm, gnu/packages/games.scm,
gnu/packages/gcc.scm, gnu/packages/geo.scm, gnu/packages/ghostscript.scm,
gnu/packages/gl.scm, gnu/packages/glib.scm, gnu/packages/gnome.scm,
gnu/packages/gnuzilla.scm, gnu/packages/graphics.scm, gnu/packages/gtk.scm,
gnu/packages/guile.scm, gnu/packages/irc.scm, gnu/packages/java.scm,
gnu/packages/kerberos.scm, gnu/packages/linux.scm, gnu/packages/lisp.scm,
gnu/packages/lxde.scm, gnu/packages/machine-learning.scm,
gnu/packages/mail.scm, gnu/packages/maths.scm, gnu/packages/messaging.scm,
gnu/packages/monitoring.scm, gnu/packages/mp3.scm, gnu/packages/music.scm,
gnu/packages/netpbm.scm, gnu/packages/networking.scm, gnu/packages/node.scm,
gnu/packages/nvi.scm, gnu/packages/ocaml.scm, gnu/packages/pdf.scm,
gnu/packages/perl.scm, gnu/packages/php.scm, gnu/packages/plotutils.scm,
gnu/packages/pretty-print.scm, gnu/packages/profiling.scm,
gnu/packages/pulseaudio.scm, gnu/packages/python-crypto.scm,
gnu/packages/python.scm, gnu/packages/qt.scm, gnu/packages/robotics.scm,
gnu/packages/sawfish.scm, gnu/packages/scanner.scm, gnu/packages/scheme.scm,
gnu/packages/scribus.scm, gnu/packages/sdl.scm,
gnu/packages/serialization.scm, gnu/packages/shells.scm,
gnu/packages/slang.scm, gnu/packages/smalltalk.scm, gnu/packages/ssh.scm,
gnu/packages/sync.scm, gnu/packages/syncthing.scm, gnu/packages/tbb.scm,
gnu/packages/terminals.scm, gnu/packages/texinfo.scm,
gnu/packages/text-editors.scm, gnu/packages/textutils.scm,
gnu/packages/tls.scm, gnu/packages/unrtf.scm,
gnu/packages/version-control.scm, gnu/packages/video.scm,
gnu/packages/vpn.scm, gnu/packages/web.scm, gnu/packages/wm.scm,
gnu/packages/wxwidgets.scm, gnu/packages/xdisorg.scm, gnu/packages/xorg.scm:
In all snippets, report errors using exceptions, or else return #t.
2018-03-16 09:08:31 -04:00
Tobias Geerinckx-Rice
7b8d3a5e1e
gnu: gtksourceview: Update to 3.24.7.
* gnu/packages/gtk.scm (gtksourceview): Update to 3.24.7.
2018-03-15 19:11:15 +01:00
Marius Bakke
60a32a2d60
gnu: pango: Explicitly propagate some inputs.
These are already propagated from Cairo, but include them for clarity.

* gnu/packages/gtk.scm (pango)[propagated-inputs]: Add FONTCONFIG, FREETYPE
and GLIB.
2018-03-15 00:03:08 +01:00
Marius Bakke
d9efe02566
gnu: pango: Update to 1.42.0.
* gnu/packages/gtk.scm (pango): Update to 1.42.0.
[inputs]: Add FRIBIDI.
2018-03-15 00:03:07 +01:00
Ricardo Wurmus
8c72ed923d
Merge branch 'master' into core-updates 2018-03-14 17:37:20 +01:00
Efraim Flashner
4a885c650d
gnu: ganv-devel: Declare a source file-name.
* gnu/packages/gtk.scm (ganv-devel)[source]: Declare a source file-name.
2018-03-13 20:17:11 +02:00
Ludovic Courtès
189be331ac
build-system/gnu: Add 'bootstrap' phase.
This factorizes what has become a widespread idiom.

* guix/build/gnu-build-system.scm (%bootstrap-scripts): New variable.
(bootstrap): New procedure.
(%standard-phases): Add it after 'unpack'.
* guix/build/ant-build-system.scm (%standard-phases): Delete 'bootstrap.
* guix/build/asdf-build-system.scm (%standard-phases/source)
(%standard-phases): Likewise.
* guix/build/cargo-build-system.scm (%standard-phases): Likewise.
* guix/build/cmake-build-system.scm (%standard-phases): Likewise.
* guix/build/dub-build-system.scm (%standard-phases): Likewise.
* guix/build/emacs-build-system.scm (%standard-phases): Likewise.
* guix/build/font-build-system.scm (%standard-phases): Likewise.
* guix/build/go-build-system.scm (%standard-phases): Likewise.
* guix/build/haskell-build-system.scm (%standard-phases): Likewise.
* guix/build/minify-build-system.scm (%standard-phases): Likewise.
* guix/build/ocaml-build-system.scm (%standard-phases): Likewise.
* guix/build/perl-build-system.scm (%standard-phases): Likewise.
* guix/build/python-build-system.scm (%standard-phases): Likewise.
* guix/build/r-build-system.scm (%standard-phases): Likewise.
* guix/build/ruby-build-system.scm (%standard-phases): Likewise.
* guix/build/scons-build-system.scm (%standard-phases): Likewise.
* guix/build/texlive-build-system.scm (%standard-phases): Likewise.
* guix/build/waf-build-system.scm (%standard-phases): Likewise.
* gnu/packages/audio.scm (faad2)[arguments]: Replace 'bootstrap.
(soundtouch, cuetools, bluez-alsa): Remove 'arguments'.
(cava)[arguments]: Replace 'bootstrap.
* gnu/packages/backup.scm (rdup): Remove 'bootstrap.
* gnu/packages/bioinformatics.scm (seek)[arguments]: Replace
'bootstrap.
* gnu/packages/bioinformatics.scm (htslib-for-sambamba): Remove
'arguments'.
* gnu/packages/ci.scm (hydra, cuirass): Remove 'bootstrap'.
* gnu/packages/crypto.scm (libb2): Remove #:phases.
* gnu/packages/databases.scm (guile-wiredtiger): Likewise.
* gnu/packages/debug.scm (stress-make): Remove 'bootstrap'.
* gnu/packages/documentation.scm (asciidoc): Likewise.
* gnu/packages/fontutils.scm (libuninameslist): Remove 'arguments'.
* gnu/packages/ftp.scm (weex): Remove 'arguments'.
* gnu/packages/game-development.scm (ois): Remove 'arguments'.
* gnu/packages/games.scm (pioneer): Remove 'bootstrap.
* gnu/packages/gnome.scm (vte-ng, byzanz): Replace 'bootstrap.
(arc-theme): Remove 'arguments'.
(faba-icon-theme): Remove 'bootstrap.
(arc-icon-theme): Remove 'arguments'.
* gnu/packages/gnunet.scm (guile-gnunet): Likewise.
* gnu/packages/gtk.scm (guile-rsvg): Likewise.
* gnu/packages/guile.scm (mcron2): Remove 'bootstrap.
(guile-bash): Remove #:phases.
(guile-git): Remove 'bootstrap.
(guile-syntax-highlight): Remove 'arguments'.
(guile-sjson): Likewise.
* gnu/packages/java.scm (classpath-devel): Remove 'bootstrap.
* gnu/packages/kodi.scm (libdvdnav/kodi)
(libdvdread/kodi, libdvdcss/kodi): Likewise.
* gnu/packages/libreoffice.scm (hunspell): Remove 'arguments'.
* gnu/packages/libusb.scm (hidapi): Likewise.
* gnu/packages/linux.scm (bridge-utils): Rename 'bootstrap' to
'patch-stuff'; move it before 'bootstrap', without autoreconf
invocation.
(eudev): Rename 'bootstrap' to 'patch-file-names', without 'autogen.sh'
invocation; move it before 'bootstrap.
(gpm): Replace 'bootstrap'.
(f2fs-tools): Remove 'arguments'.
(rng-tools): Remove #:phases.
* gnu/packages/messaging.scm (hexchat): Rename 'bootstrap' to
'copy-intltool-makefile'; remove "autoreconf" invocation and move before
'bootstrap'.
(libmesode): Remove 'arguments'.
(libstrophe): Likewise.
* gnu/packages/microcom.scm (microcom): Likewise.
* gnu/packages/networking.scm (libnet): Remove 'bootstrap.
* gnu/packages/onc-rpc.scm (libnsl): Remove 'arguments'.
* gnu/packages/package-management.scm (guix): Replace 'bootstrap.
* gnu/packages/sawfish.scm (librep): Remove 'arguments'.
* gnu/packages/version-control.scm (findnewest): Likewise.
* gnu/packages/video.scm (liba52, handbrake, motion): Replace
'bootstrap.
* gnu/packages/web.scm (fcgiwrap): Remove #:phases.
(tidy): Replace 'bootstrap.
(gumbo-parser): Remove #:phases.
* gnu/packages/wget.scm (wget2): Replace 'bootstrap.
* gnu/packages/wm.scm (i3lock-color): Remove #:phases.
* gnu/packages/xdisorg.scm (xclip): Likewise.
* gnu/packages/xml.scm (libxls): Replace 'bootstrap'.
* gnu/packages/xorg.scm (xf86-video-freedreno)
(xf86-video-intel): Remove #:phases.
* gnu/packages/zile.scm (zile-on-guile): Replace 'bootstrap.
2018-03-11 22:04:40 +01:00
Marius Bakke
d8fa1890c7
Merge branch 'master' into staging 2018-03-08 21:21:05 +01:00
Marius Bakke
7005f8cb58
gnu: harfbuzz: Update to 1.7.6.
* gnu/packages/gtk.scm (harfbuzz): Update to 1.7.6.
[native-inputs]: Add WHICH.  Replace PYTHON-2 with PYTHON-WRAPPER.
2018-03-08 14:17:57 +01:00
Marius Bakke
e07a44891c
gnu: Add gtksourceviewmm.
* gnu/packages/gtk.scm (gtksourceviewmm): New public variable.
2018-03-07 14:53:24 +01:00
Marius Bakke
8e933cb36a
gnu: Use HTTPS on gtkmm.org home pages.
* gnu/packages/gtk.scm (atkmm, gtkmm)[home-page]: Use HTTPS.
* gnu/packages/gnome.scm (libgnomecanvasmm)[home-page]: Likewise.
* gnu/packages/glib.scm (glibmm)[home-page]: Likewise.
2018-03-07 14:53:24 +01:00
Marius Bakke
6a49ae7864
gnu: gtkmm: Use the for-test xorg variant for tests.
* gnu/packages/gtk.scm (gtkmm)[native-inputs]: Replace XORG-SERVER with
XORG-SERVER-1.19.3.
[arguments]: Add #:disallowed-references.
2018-03-07 14:53:24 +01:00
Marius Bakke
29c7b4d638
gnu: gtkmm: Update to 3.22.2.
* gnu/packages/gtk.scm (gtkmm): Update to 3.22.2.
[arguments]: Set #:configure-flags.
2018-03-07 14:53:24 +01:00
Marius Bakke
86990eeda2
Merge branch 'master' into staging 2018-03-01 18:04:12 +01:00