3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

9199 commits

Author SHA1 Message Date
Matthias Beyer 0bf6e25a6b aerc: 0.1.0 -> 0.1.1
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
2019-06-10 16:25:08 +02:00
Nikolay Amiantov eff932e22b syncplay: add TLS support
Also cleanup.
2019-06-10 12:23:16 +03:00
Will Dietz f46793a32c
tor-browser-bundle-bin: 32bit hashfix 2019-06-09 21:22:06 -05:00
Vladyslav M 6b8db64145
synapse-bt: unstable-2019-05-26 -> 1.0 2019-06-10 00:11:12 +03:00
Mario Rodas 1813cf108e
Merge pull request #62892 from marsam/update-websocketd
websocketd: 0.3.0 -> 0.3.1
2019-06-09 10:34:35 -05:00
Vladimír Čunát e8f8df0699
Merge #61877: thunderbird*: 60.6.0 -> 60.7.0 (security) 2019-06-09 15:03:11 +02:00
Vladimír Čunát c5194a2c55
Revert "filezilla: add wrapper to set necessary FZ_DATADIR"
This reverts commit 61940b89a5 #62340.
Apparently it's not needed anymore after the update, so let me clean up.
2019-06-09 13:17:05 +02:00
Vladimír Čunát 7ec794f90a
Merge #62276: libfilezilla: 0.13.0 -> 0.16.0; filezilla: -> 3.42.1 2019-06-09 13:17:04 +02:00
Franz Pletz 6825b3f4b2
Merge pull request #62827 from jabranham/syncthing
syncthing: 1.1.3 -> 1.1.4
2019-06-09 10:47:23 +00:00
Vladimír Čunát 4093d645b3
Merge #62340: filezilla: add wrapper to set necessary FZ_DATADIR 2019-06-09 12:30:44 +02:00
Vladimír Čunát 4422d62717
filezilla: enableParallelBuilding = true 2019-06-09 12:29:57 +02:00
Mario Rodas ab1436b13e
websocketd: 0.3.0 -> 0.3.1 2019-06-09 04:20:00 -05:00
Peter Hoeg 4d2bd93da8
Merge pull request #61858 from cf6b88f/freerdp-nocaps
freerdp: add nocaps option that turns Caps Lock into Control
2019-06-09 15:42:32 +08:00
Mario Rodas a2c2c385be
Merge pull request #62829 from Veske/update-terraform-0-12
terraform: 0.12.0 -> 0.12.1
2019-06-08 20:11:20 -05:00
Andreas Rammhold 03128836bb
firefox: 67.0 -> 67.0.1 2019-06-08 18:06:48 +02:00
Andreas Rammhold bb4dc7f7c0
firefox-devedition-bin: 67.0b19 -> 68.0b8 2019-06-08 17:57:28 +02:00
Andreas Rammhold 2779a3f26b
firefox-beta-bin: 67.0b19 -> 68.0b8 2019-06-08 17:56:58 +02:00
Andreas Rammhold d134af3aba
firefox-bin: 67.0 -> 67.0.1 2019-06-08 17:54:58 +02:00
Joachim F 497872c294
Merge pull request #62803 from dtzWill/update/tor-browser-bundle-8.5.1
tor-browser-bundle: 8.5 -> 8.5.1, security fix!
2019-06-08 07:58:43 +00:00
Wael Nasreddine 100f0b032d
Merge pull request #62830 from tadeokondrak/aerc
aerc: init at 0.1.0
2019-06-07 20:51:13 -07:00
Eric Bailey 7f9a2f0de7 helmfile: fix modSha256
It seems like this was another case where my darwin setup was acting weird.
2019-06-07 15:13:02 -05:00
Maximilian Bosch 23bd9e7e3e
Merge pull request #62738 from geistesk/wee-slack-2.3
weechatScripts.wee-slack: 2.2.0 -> 2.3.0
2019-06-07 18:39:01 +02:00
Renaud d95a82cdc4
Merge pull request #62582 from anton-dessiatov/tilt-0.8.8
tilt: 0.8.1 -> 0.8.8
2019-06-07 18:02:29 +02:00
Jörg Thalheim 6abbf8e15f
aerc: init at 0.1.0
Co-authored-by: Tadeo Kondrak <me@tadeo.ca>
2019-06-07 09:11:32 -06:00
Kaspar Tint f2c8817208 terraform: 0.12.0 -> 0.12.1 2019-06-07 17:51:44 +03:00
Alex Branham 9a0e51346b
syncthing: 1.1.3 -> 1.1.4 2019-06-07 09:34:17 -05:00
Peter Simons 3a64e98747 esniper: update to latest git revision "Version_2_35_0-15-g91d2665"
The latest release no longer works.
2019-06-07 15:43:52 +02:00
Franz Pletz ff05703611
Merge pull request #62701 from dtzWill/update/podman-cni-and-containers-oh-my
podman, cni{,-plugins}, cri*: updates
2019-06-07 11:54:52 +00:00
Andreas Rammhold 4d1c058e86
Merge pull request #62815 from andir/weechat
weechat: 2.4 -> 2.5
2019-06-07 13:28:41 +02:00
Franz Pletz 88c898df54
Merge pull request #62816 from johanot/kubernetes-1.14.3
kubernetes: 1.14.2 -> 1.14.3 (CVE-2019-11245)
2019-06-07 11:27:13 +00:00
Johan Thomsen 415e8e5820 kubernetes: 1.14.2 -> 1.14.3 2019-06-07 10:14:00 +02:00
Andreas Rammhold 153bfb4b4e
weechat: 2.4 -> 2.5
Changelog [1]:

  New features
    - core: use getopt to parse command line arguments
    - core: add option weechat.look.prefix_same_nick_middle
    - core: add option weechat.look.buffer_time_same
    - core: use seconds by default in /repeat interval, allow unit for the interval
    - core: allow text in addition to a command in command /repeat
    - core: add option "addreplace" in command /filter
    - api: return allocated string in hook_info callback and function info_get
    - api: replace argument "keep_eol" by "flags" in function string_split
    - api: add function command_options
    - api: add function string_match_list
    - irc: add bar items "irc_nick", "irc_host" and "irc_nick_host"
    - irc: add variable "host" in server structure
    - relay: add support of UNIX socket
    - relay: add option relay.weechat.commands
    - script: use SHA-512 instead of MD5 for script checksum
    - spell: rename aspell plugin to spell
    - trigger: add hooks "info" and "info_hashtable"
    - xfer: rename option xfer.network.speed_limit to xfer.network.speed_limit_send, add option xfer.network.speed_limit_recv

  Bug fixes
    - core: don’t execute command scheduled by /repeat and /wait if the buffer does not exist any more
    - core: set max length to 4096 for /secure passphrase
    - core: refilter only affected buffers on filter change
    - fset: fix slow refresh of fset buffer during /reload
    - irc: fix parsing of MODE command when there are colons after the first mode argument
    - irc: fix memory leak in infos "irc_server_isupport" and "irc_server_isupport_value"
    - irc: fix length of string for SHA-512, SHA-256 and SHA-1 in help on ssl_fingerprint option
    - irc: display an error with /allchan -current or /allpv -current if the current buffer is not an irc buffer
    - irc: fix update of channels modes with arguments when joining a channel
    - irc: quote NICK command argument sent to the server
    - php: fix memory leak in functions string_eval_expression, string_eval_path_home, key_bind, hook_process_hashtable, hook_hsignal_send, info_get_hashtable, hdata_update
    - relay: fix crash when a weechat relay client reloads the relay plugin with /plugin reload relay
    - spell: fix detection of nick followed by the nick completer
    - trigger: fix split of hook arguments

  Tests
    - unit: add tests on function util_signal_search

  Build
    - core: fix value of libdir in file weechat.pc
    - core: fix generation of man page weechat-headless with autotools
    - core: add CMake option "ENABLE_CODE_COVERAGE" to compile with code coverage options (CMake ≥ 3.0 is now required)
    - core: fix compilation on Mac OS
    - lua: add detection of Lua 5.3 with autotools
    - ruby: add detection of Ruby 2.6
    - tests: fix compilation of tests on FreeBSD

[1] https://weechat.org/files/changelog/ChangeLog-2.5.html#v2.5
2019-06-07 10:05:14 +02:00
Will Dietz 88dc069219
tor-browser-bundle: 8.5 -> 8.5.1, security fix!
I think the source variant needs special handling, sorry.
2019-06-06 22:50:21 -05:00
Eric Bailey 6fed86581c helmfile: 0.64.1 -> 0.73.0
Also, ditch vgo2nix in favor of buildGoModule.
2019-06-06 17:53:13 -05:00
Andreas Rammhold 18a2a96737
Merge pull request #62728 from talyz/firefox-wayland
firefox-wayland: Add missing dependency libglvnd (libEGL)
2019-06-06 01:31:54 +02:00
geistesk 1420e7dea8 weechatScripts.wee-slack: 2.2.0 -> 2.3.0 2019-06-05 22:17:24 +02:00
talyz ae2778c9e3 firefox-wayland: Add missing dependency libglvnd (libEGL)
Firefox running in wayland mode is unable to find and load
libEGL.so (and says so on stdout). This puts it in "basic"
mode (unaccelerated graphics) and disables WebGL. Fix this by adding
libglvnd to the LD_LIBRARY_PATH.
2019-06-05 14:49:55 +02:00
Ivan Kozik 8c78ae27f6 chromium: 74.0.3729.157 -> 75.0.3770.80
CVE-2019-5828 CVE-2019-5829 CVE-2019-5830 CVE-2019-5831
CVE-2019-5832 CVE-2019-5833 CVE-2019-5834 CVE-2019-5835
CVE-2019-5836 CVE-2019-5837 CVE-2019-5838 CVE-2019-5839
CVE-2019-5840

Update a patch for Python 3, fixes #62347.

Update a GN arg to fix this warning:

warning: The GN arg 'remove_webcore_debug_symbols' is deprecated and
warning: will be removed April 15, 2019. Please change your args.gn
warning: to use 'blink_symbol_level = 0'. https://crbug.com/943869
2019-06-05 09:27:52 +00:00
Ivan Kozik 4481a0150b chromium: use LLVM 8.0.0 to more closely match upstream 2019-06-05 09:27:52 +00:00
worldofpeace 5e6001cfde
Merge pull request #62492 from r-ryantm/auto-update/opera
opera: 58.0.3135.127 -> 60.0.3255.109
2019-06-04 23:01:23 -04:00
worldofpeace 35c3396f41
Merge pull request #62595 from cstrahan/dropbox/fix-tray-menu
dropbox: fix tray menu with StatusNotifierItem trays
2019-06-04 22:45:26 -04:00
Robert Hensing 50be73c4b2
Merge pull request #62682 from dtzWill/update/skype-8.46.0.60
skype: 8.45.0.41 -> 8.46.0.60
2019-06-05 00:08:26 +02:00
Joachim F 6500ab9e61
Merge pull request #62676 from KaiHa/tor-browser-xauthority
tor-browser-bundle: set default value for XAUTHORITY
2019-06-04 21:30:13 +00:00
Will Dietz 74e9b6441d
cni-plugins: 0.7.5 -> 0.8.0
https://github.com/containernetworking/plugins/releases/tag/v0.8.0

Maybe need to improve script invocation for other platforms,
but for now we limit to linux so keep it simple.
2019-06-04 15:45:20 -05:00
Will Dietz 15fbb8e90a
cni: simplify now that default build is sufficient 2019-06-04 15:45:13 -05:00
Will Dietz a52a89c266
cni: 0.6.0 -> 0.7.0
https://github.com/containernetworking/cni/releases/tag/v0.7.0
2019-06-04 15:45:05 -05:00
Michael Weiss 28556f054f
tdesktop: 1.7.0 -> 1.7.3
GCC 8.x is required to avoid the following error:

cc1plus: error: -Werror=class-memaccess: no option -Wclass-memaccess

If we build without "-Wno-error=class-memaccess" the build should fail
and the upstream requirements were raised from GCC 7 to GCC 8 anyway:
b2f821d3de

The two additional patches are required to avoid build errors like this:

/build/source/Telegram/ThirdParty/qtlottie/src/bodymovin/bmbase.cpp:123:12:
error: invalid use of incomplete type 'class QDebug'
   qWarning()
            ^
In file included from
/nix/store/1qk60bhxcf95iicms7mkyjq3h7lz136p-qtbase-5.12.0-dev/include/QtCore/qglobal.h:1200,
                 from
/nix/store/1qk60bhxcf95iicms7mkyjq3h7lz136p-qtbase-5.12.0-dev/include/QtCore/qalgorithms.h:43,
                 from
/nix/store/1qk60bhxcf95iicms7mkyjq3h7lz136p-qtbase-5.12.0-dev/include/QtCore/qlist.h:43,
                 from
/nix/store/1qk60bhxcf95iicms7mkyjq3h7lz136p-qtbase-5.12.0-dev/include/QtCore/QList:1,
                 from
/build/source/Telegram/ThirdParty/qtlottie/src/bodymovin/bmbase.h:31,
                 from
/build/source/Telegram/ThirdParty/qtlottie/src/bodymovin/bmbase.cpp:29:
/nix/store/1qk60bhxcf95iicms7mkyjq3h7lz136p-qtbase-5.12.0-dev/include/QtCore/qlogging.h:57:7:
note: forward declaration of 'class QDebug'
 class QDebug;
       ^~~~~~
2019-06-04 22:03:34 +02:00
Will Dietz 5ae032beda
skype: 8.45.0.41 -> 8.46.0.60
https://support.skype.com/en/faq/FA34778/release-notes-for-skype-for-windows-mac-linux-and-web
2019-06-04 14:55:10 -05:00
Kai Harries ceee963080 tor-browser-bundle: set default value for XAUTHORITY
XAUTHORITY is not set on systems using wayland. Therefore set a
default value for XAUTHORITY.
2019-06-04 21:07:00 +02:00
Ryan Mulligan 0c2eff0539
Merge pull request #62456 from r-ryantm/auto-update/kubernetes
kubernetes: 1.14.1 -> 1.14.2
2019-06-04 05:52:40 -07:00
Elmo Todurov 52208c3b98 freerdp: add nocaps option that turns Caps Lock into Control 2019-06-04 13:45:01 +03:00
Bas van Dijk 6b4279e792 terraform-provider-elasticsearch: 0.6.0 -> 0.7.0 2019-06-04 12:34:24 +02:00
Matthew Bauer 8c09536ef1
Merge pull request #62622 from matthewbauer/zoom-us-ld-preload
zoom-us: set LD_PRELOAD=.../v4l2convert.so
2019-06-03 15:07:38 -04:00
Matthew Bauer 9d65bb588f zoom-us: set LD_PRELOAD=.../v4l2convert.so
This was needed for my webcam to work with zoom-us. v4l2convert is a
wrapper for apps that only support simple bgr24 or yuv420. For these
apps to support webcams that don’t use those formats, we need to use
LD_PRELOAD to get those symbols. Taken from archlinux wiki:

https://wiki.archlinux.org/index.php/Webcam_setup#V4L1_support
2019-06-03 13:08:45 -04:00
Matthew Bauer 3e96aebf4e enchant: 1.6.1 -> 2.2.3
Moves default enchant to 2.2.3. Release url:

https://github.com/AbiWord/enchant/releases/tag/v2.0.0

Mostly need to verify no breakage occurs for packages using enchant.
2019-06-03 11:13:36 -04:00
Jörg Thalheim 51d3d5b8d0
skypeforlinux: 8.44.0.40 -> 8.45.0.41 (#62569)
skypeforlinux: 8.44.0.40 -> 8.45.0.41
2019-06-03 13:25:07 +01:00
Jörg Thalheim e8e1dc71c5
Merge pull request #62529 from danieldk/remove-btsync-module
nixos/btsync: remove
2019-06-03 13:21:58 +01:00
Charles Strahan 8f9a2f1358
dropbox: fix tray menu with StatusNotifierItem trays
If dropbox can't load libappindicator, it will fallback to using the old
xembed protocol. If you (or your Desktop Environment) are running
something like KDE's XEmbed SNI Proxy, then you'll at least see an icon,
but clicking the icon won't give you menu.

Adding libappindicator to the env allows dropbox to fully integrate with
contemporary status trays, while still falling back to xembed if the
required DBus service is not present.
2019-06-03 05:57:15 -04:00
Maximilian Bosch 739f74d056
Merge pull request #62586 from davidtwco/franz-5.1.0
franz: 5.0.0-beta.19 -> 5.1.0
2019-06-03 11:44:45 +02:00
David Wood e82ddcb684
franz: 5.0.0-beta.19 -> 5.1.0 2019-06-03 08:57:01 +01:00
Anton Desyatov 1ae9db2231 tilt: 0.8.1 -> 0.8.8 2019-06-03 14:23:19 +07:00
Daniël de Kok 3093e35f8f bittorrentSync: remove 2019-06-03 09:16:13 +02:00
R. RyanTM dcbb041636 skypeforlinux: 8.44.0.40 -> 8.45.0.41
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/skypeforlinux/versions
2019-06-02 21:02:52 -07:00
worldofpeace 43311f45c7
Merge pull request #62258 from marsam/fix-flexget
flexget: fix build
2019-06-02 16:50:10 -04:00
Alyssa Ross 45f4cc1957
Merge pull request #57803 from alyssais/lynx
lynx: enable default-colors
2019-06-02 19:16:55 +00:00
Mario Rodas c5e7786260
flexget: 2.20.22 -> 2.21.2 2019-06-02 11:48:56 -05:00
Mario Rodas cc38877ab7
flexget: fix build 2019-06-02 11:48:56 -05:00
R. RyanTM 6d012050ca opera: 58.0.3135.127 -> 60.0.3255.109
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/opera/versions
2019-06-02 03:52:03 -07:00
R. RyanTM abf603b8be kubernetes: 1.14.1 -> 1.14.2
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/kubernetes/versions
2019-06-01 18:52:21 -07:00
Mario Rodas 4bd48f6125
Merge pull request #62409 from dywedir/synapse-bt
synapse-bt: unstable-2018-10-17 -> unstable-2019-05-26
2019-06-01 18:03:05 -05:00
Kierán Meinhardt eb8a9f68cf libcoap: init at 4.2.0 2019-06-01 23:47:25 +02:00
Vladyslav M 6cc9bc3f81
synapse-bt: unstable-2018-10-17 -> unstable-2019-05-26 2019-06-01 21:21:35 +03:00
worldofpeace c90e94a641
Merge pull request #62253 from nyanloutre/riot_update_1_2_0
riot-{web,desktop}: 1.1.0 -> 1.2.1
2019-06-01 11:49:12 -04:00
nyanloutre 06195c925f riot-{web,desktop}: 1.1.0 -> 1.2.1 2019-06-01 11:48:34 -04:00
Alyssa Ross 062210bdff treewide: update cargoSha256 hashes for cargo-vendor upgrade
A recent upgrade of cargo-vendor changed its output slightly, which
broke all cargoSha256 hashes in nixpkgs.
See https://github.com/NixOS/nixpkgs/issues/60668 for more information.

Since then, a few hashes have been fixed in master by hand, but there
were a lot still to do, so I did all of the ones left over with some
scripts I wrote.

The one hash I wasn’t able to update was habitat's, because it’s
currently broken and the build doesn’t get far enough to produce a
hash anyway.
2019-06-01 15:17:52 +00:00
Michael Weiss 87bb9234ab
signal-desktop: 1.25.0 -> 1.25.1 2019-06-01 14:13:50 +02:00
markuskowa 4b25d2fd94
Merge pull request #62357 from r-ryantm/auto-update/balsa
balsa: 2.5.6 -> 2.5.7
2019-06-01 13:24:14 +02:00
R. RyanTM f1402eb425 balsa: 2.5.6 -> 2.5.7
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/balsa/versions
2019-05-31 23:44:23 -07:00
Bryan Gardiner 61940b89a5
filezilla: add wrapper to set necessary FZ_DATADIR
Filezilla fails to start currently, with the following message being
shown in a lone dialog before the program exits:

> Could not find the resource files for FileZilla, closing FileZilla.
> You can set the data directory of FileZilla using the '--datadir
> <custompath>' commandline option or by setting the FZ_DATADIR
> environment variable.

This commit adds a wrapper for the filezilla binary to set the
environment variable to the package root, which fixes the issue.
2019-05-31 19:24:41 -07:00
worldofpeace 67ed5b3362
Merge pull request #62286 from vdemeester/update-minishift
minishift: 1.33.0 -> 1.34.0
2019-05-31 20:11:25 -04:00
Will Dietz 3a26a1fe94 weston: 5.0.0 -> 6.0.0 (#58522)
https://lists.freedesktop.org/archives/wayland-devel/2019-March/040356.html
https://lists.freedesktop.org/archives/wayland-devel/2019-March/040334.html

* weston: use freerdp2 not legacy
* freerdp_legacy: drop as no longer needed (weston was last user)

Co-Authored-By: Michael Weiss <dev.primeos@gmail.com>
2019-05-31 22:59:50 +02:00
Michael Weiss 37d232fb5f
signal-desktop: 1.24.1 -> 1.25.0 2019-05-31 21:20:38 +02:00
Vincent Demeester 2ae57776a8
minishift: 1.33.0 -> 1.34.0
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2019-05-31 09:39:20 +02:00
Will Dietz 971bea9093
filezilla: 3.31.0 -> 3.42.1 2019-05-30 21:59:51 -05:00
Tim Steinbach 2c074fc6c8
vivaldi: 2.5.1525.46-1 -> 2.5.1525.48-1 2019-05-30 11:00:21 -04:00
SLNOS c4962cd506 firefoxPackages.tor-browser: 8.0.9 -> 8.5.0
Actually, more like -> 8.5.0.1 as this version is made against the
branch with the pending fixup patch applied.
2019-05-30 12:31:59 +00:00
Peter Hoeg c10addd601
Merge pull request #62204 from peterhoeg/u/quaternion
quaternion: 0.0.9.4 -> 0.0.9.4c
2019-05-30 14:31:19 +08:00
Michael Weiss 61adb40d6f
gns3Packages.{server,gui}Preview: 2.2.0b1 -> 2.2.0b2 2019-05-29 22:02:16 +02:00
Michael Weiss 63e443d84d
gns3Packages.{server,gui}Stable: 2.1.19 -> 2.1.20 2019-05-29 22:02:16 +02:00
Maximilian Bosch a6238795a6
Merge pull request #62201 from dtzWill/update/feedreader-2.9.2
feedreader: 2.8.2 -> 2.9.2
2019-05-29 12:39:51 +02:00
Frederik Rietdijk 97aba37876
Merge pull request #61657 from NixOS/staging-next
Staging next
2019-05-29 08:38:21 +00:00
Will Dietz 1540c0e120 wireshark: 3.0.1 -> 3.0.2 2019-05-29 16:20:12 +09:00
Peter Hoeg 907e3c8374 quaternion: 0.0.9.4 -> 0.0.9.4c
This is technically not needed as the changes only relate to appstream packaging
but as we are rebuilding it anyway due to libqmatrixclient changing, we might as
well.
2019-05-29 10:08:12 +08:00
Mario Rodas 21e2601d2a
Merge pull request #62145 from GRBurst/protonmail-bridge
protonmail-bridge: 1.1.4 -> 1.1.5
2019-05-28 21:02:57 -05:00
Will Dietz b186b03253
feedreader: 2.8.2 -> 2.9.2
https://github.com/jangernert/FeedReader/releases/tag/v2.9.1
https://github.com/jangernert/FeedReader/releases/tag/v2.9.2
2019-05-28 21:02:10 -05:00
Michael Weiss 3b38247781
gns3Packages.{server,gui}Stable: 2.1.18 -> 2.1.19 2019-05-29 00:36:41 +02:00
Timo Kaufmann 53b08beea6
tridactyl-native: init at 1.14.9 (#61703) 2019-05-28 13:14:06 +02:00
GRBurst c22e43fe44 protonmail bridge: 1.1.4 -> 1.1.5 2019-05-28 12:19:32 +02:00
Garry Cairns f6a68410f8 Adds Citrix workspace app package
Citrix workspace is replacing Citrix receiver as per
https://docs.citrix.com/en-us/citrix-workspace-app.html
2019-05-28 08:50:47 +02:00
Frederik Rietdijk 36a6746f21 Merge master into staging-next 2019-05-28 08:32:03 +02:00