charIes17 [Wed, 4 Jan 2017 09:23:23 +0000 (10:23 +0100)]
x11-wm/lumina: bump to version 1.2.0
x11-wm/lumina: unbundle desktop-utils
Removing optional Desktop Utilities
- lumina-archiver (front-end to tar, used for managing/creating archives)
- lumina-calculator (scientific calculator with an easy-to-use interface)
- lumina-fileinfo (file properties viewer, and simple XDG application registration creator)
- lumina-fm (Insight File Manager, used for browsing/interacting with the system files)
- lumina-screenshot (Create/modify/save screenshots)
- lumina-textedit (Plaintext editor with syntax highlighting, tab support, and find/replace functionality)
"Core Utilities" are still bundled
- lumina-config (used for configuring the desktop)
- lumina-xconfig (front-end to xrandr, used for managing monitors)
- lumina-search (simple file/application search utility)
REDEPND on sys-fs/inotify-tools
Changes as requested by
https://github.com/gentoo/gentoo/pull/3319#pullrequestreview-
15085468
Package-Manager: portage-2.3.0
Closes: https://github.com/gentoo/gentoo/pull/3319
charIes17 [Sun, 22 Jan 2017 09:26:36 +0000 (10:26 +0100)]
lxde-base/lxpanel: bump to 0.9.3
Package-Manager: portage-2.3.0
Closes: https://github.com/gentoo/gentoo/pull/3304
charIes17 [Sun, 11 Dec 2016 14:16:37 +0000 (15:16 +0100)]
lxde-base/lxpanel: version bump to 0.9.2
Gentoo-Bug: 601586
Package-Manager: portage-2.3.0
Closes: https://github.com/gentoo/gentoo/pull/3304
David Seifert [Thu, 26 Jan 2017 23:10:11 +0000 (00:10 +0100)]
Partially revert "profiles/base/package.use.mask: force off rust on www-client/firefox"
This reverts commit
a47178b2b36a03e644f4bd37a1688edb666e5d53.
Jory A. Pratt [Thu, 26 Jan 2017 23:10:50 +0000 (17:10 -0600)]
www-client/firefox : Update metadata.xml, drop gtk3 support from esr
build.
Sebastian Pipping [Thu, 26 Jan 2017 23:09:53 +0000 (00:09 +0100)]
www-apps/wordpress: 4.7.2 (security)
https://wordpress.org/news/2017/01/wordpress-4-7-2-security-release/
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Alexis Ballier [Thu, 26 Jan 2017 23:06:19 +0000 (00:06 +0100)]
sci-libs/rtabmap: add := dep on vtk and pcl
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Alexis Ballier [Thu, 26 Jan 2017 21:58:41 +0000 (22:58 +0100)]
sci-libs/pcl: add := dep on vtk
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Alexis Ballier [Thu, 26 Jan 2017 21:57:21 +0000 (22:57 +0100)]
sci-libs/pcl: remove now unused patch
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Alexis Ballier [Thu, 26 Jan 2017 21:56:20 +0000 (22:56 +0100)]
sci-libs/pcl: remove old
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Mykyta Holubakha [Fri, 20 Jan 2017 01:32:43 +0000 (03:32 +0200)]
dev-libs/sway: do not set LD_LIBRARY_PATH
follows an upstream change (prior behavior could cause issues when
crosscompiling)
Closes: https://github.com/gentoo/gentoo/pull/3556
Jimi Huotari [Wed, 25 Jan 2017 12:21:09 +0000 (14:21 +0200)]
media-video/obs-studio: Use 'gnome2-utils' to update the icon cache.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/3643
Jimi Huotari [Wed, 25 Jan 2017 09:35:30 +0000 (11:35 +0200)]
media-video/obs-studio: Version bump to 17.0.2.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/3643
Jimi Huotari [Sun, 6 Nov 2016 10:40:08 +0000 (12:40 +0200)]
app-emulation/vice: Fix compiling with '>=media-video/ffmpeg-3'.
Add a patch to allow compiling '2.4.27-r2' with 'ffmpeg-3' installed.
Backported from: https://sourceforge.net/p/vice-emu/code/31580/
Also change 'PATCH' to 'PATCHES'.
Package-Manager: portage-2.3.2
Closes: https://github.com/gentoo/gentoo/pull/2759
Jimi Huotari [Thu, 26 Jan 2017 22:48:17 +0000 (23:48 +0100)]
app-emulation/vice: Version bump to 2.4.31.
Package-Manager: portage-2.3.2
Closes: https://github.com/gentoo/gentoo/pull/2643
Yuri Konotopov [Thu, 26 Jan 2017 14:38:56 +0000 (18:38 +0400)]
gnome-extra/chrome-gnome-shell: added patches to fix various issues.
Closes: https://github.com/gentoo/gentoo/pull/3660
Jonathan Scruggs [Thu, 26 Jan 2017 17:16:06 +0000 (17:16 +0000)]
sys-apps/qdirstat: bump to version 1.2
New version has a lot of bug fixes including better BTRFS support.
Signed-off by: Jonathan Scruggs (j.scruggs@gmail.com)
Closes: https://github.com/gentoo/gentoo/pull/3661
Craig Andrews [Wed, 25 Jan 2017 20:57:51 +0000 (15:57 -0500)]
media-plugins/kodi-pvr-mythtv: add dependency on sys-libs/zlib
Closes: https://github.com/gentoo/gentoo/pull/3652
Martin von Gagern [Tue, 24 Jan 2017 19:50:08 +0000 (20:50 +0100)]
dev-python/sphinx: <1.5.1 is incompatible with docutils 0.13
Closes: https://github.com/gentoo/gentoo/pull/3635
Louis Sautier [Wed, 25 Jan 2017 23:28:35 +0000 (00:28 +0100)]
net-p2p/syncthing: remove old
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/3656
Louis Sautier [Wed, 25 Jan 2017 23:27:49 +0000 (00:27 +0100)]
net-p2p/syncthing: bump to 0.14.21
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/3656
Louis Sautier [Wed, 25 Jan 2017 20:38:47 +0000 (21:38 +0100)]
net-p2p/airdcpp-webclient: remove old
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/3651
Louis Sautier [Wed, 25 Jan 2017 20:38:05 +0000 (21:38 +0100)]
net-p2p/airdcpp-webclient: fix an issue with zlib >= 1.2.10
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/3651
Michael Mair-Keimberger (asterix) [Thu, 26 Jan 2017 17:24:59 +0000 (18:24 +0100)]
net-proxy/dante: remove unused patches
Closes: https://github.com/gentoo/gentoo/pull/3666
Michael Mair-Keimberger (asterix) [Thu, 26 Jan 2017 17:16:46 +0000 (18:16 +0100)]
net-nds/nsscache: remove unused file/patch
Closes: https://github.com/gentoo/gentoo/pull/3666
Michael Mair-Keimberger (asterix) [Thu, 26 Jan 2017 17:12:49 +0000 (18:12 +0100)]
net-misc/pedro: remove unused patch
Closes: https://github.com/gentoo/gentoo/pull/3665
Michael Mair-Keimberger (asterix) [Thu, 26 Jan 2017 17:11:55 +0000 (18:11 +0100)]
net-misc/mikutter: remove unused patch
Closes: https://github.com/gentoo/gentoo/pull/3663
Michael Mair-Keimberger (asterix) [Wed, 25 Jan 2017 19:45:58 +0000 (20:45 +0100)]
net-misc/directvnc: remove unused patch
Closes: https://github.com/gentoo/gentoo/pull/3649
Michael Mair-Keimberger (asterix) [Wed, 25 Jan 2017 19:44:27 +0000 (20:44 +0100)]
net-misc/clusterssh: remove unused patch
Closes: https://github.com/gentoo/gentoo/pull/3648
Michael Mair-Keimberger (asterix) [Wed, 25 Jan 2017 19:46:41 +0000 (20:46 +0100)]
net-misc/grive: remove unused patch
Closes: https://github.com/gentoo/gentoo/pull/3647
Michael Mair-Keimberger (asterix) [Tue, 24 Jan 2017 16:43:29 +0000 (17:43 +0100)]
net-misc/stuntman: remove unused file
Closes: https://github.com/gentoo/gentoo/pull/3628
Michael Mair-Keimberger (asterix) [Tue, 24 Jan 2017 16:42:44 +0000 (17:42 +0100)]
net-misc/dahdi-tools: remove unused file
Closes: https://github.com/gentoo/gentoo/pull/3628
Michael Mair-Keimberger (asterix) [Tue, 24 Jan 2017 16:41:39 +0000 (17:41 +0100)]
net-misc/bird: remove unused patches/files
Closes: https://github.com/gentoo/gentoo/pull/3628
Michael Mair-Keimberger (asterix) [Tue, 24 Jan 2017 16:38:41 +0000 (17:38 +0100)]
net-misc/astmanproxy: remove unused patch
Closes: https://github.com/gentoo/gentoo/pull/3628
Michael Mair-Keimberger (asterix) [Mon, 23 Jan 2017 18:03:49 +0000 (19:03 +0100)]
net-print/pnm2ppa: remove unused patch
Closes: https://github.com/gentoo/gentoo/pull/3608
Michael Mair-Keimberger (asterix) [Mon, 23 Jan 2017 18:03:24 +0000 (19:03 +0100)]
net-print/lprng: remove unused patch
Closes: https://github.com/gentoo/gentoo/pull/3608
Michael Mair-Keimberger (asterix) [Mon, 23 Jan 2017 18:02:38 +0000 (19:02 +0100)]
net-print/c2esp: remove unused patch
Closes: https://github.com/gentoo/gentoo/pull/3608
Michael Mair-Keimberger (asterix) [Mon, 23 Jan 2017 18:01:35 +0000 (19:01 +0100)]
net-libs/openslp: remove unused patches
Closes: https://github.com/gentoo/gentoo/pull/3608
Michael Mair-Keimberger (asterix) [Sat, 21 Jan 2017 18:39:46 +0000 (19:39 +0100)]
net-p2p/vuze: remove unused patch
Closes: https://github.com/gentoo/gentoo/pull/3583
Michael Mair-Keimberger (asterix) [Sat, 21 Jan 2017 18:37:15 +0000 (19:37 +0100)]
net-nds/jxplorer: remove unused patch/file
Closes: https://github.com/gentoo/gentoo/pull/3583
Michael Mair-Keimberger (asterix) [Sat, 21 Jan 2017 18:34:23 +0000 (19:34 +0100)]
net-misc/mindterm: remove unused patch
Closes: https://github.com/gentoo/gentoo/pull/3583
Michael Mair-Keimberger (asterix) [Sat, 21 Jan 2017 18:33:49 +0000 (19:33 +0100)]
net-im/kouchat: remove unused xml file
Closes: https://github.com/gentoo/gentoo/pull/3583
Michael Mair-Keimberger (asterix) [Mon, 16 Jan 2017 18:02:08 +0000 (19:02 +0100)]
net-p2p/gtk-gnutella: remove unused patch
Closes: https://github.com/gentoo/gentoo/pull/3509
Michael Mair-Keimberger (asterix) [Mon, 16 Jan 2017 18:01:38 +0000 (19:01 +0100)]
net-analyzer/sslscan: remove unused patch
Closes: https://github.com/gentoo/gentoo/pull/3509
Michał Górny [Thu, 26 Jan 2017 22:30:41 +0000 (23:30 +0100)]
virtual/python-singledispatch: Enable python3.6
Michał Górny [Thu, 26 Jan 2017 22:30:07 +0000 (23:30 +0100)]
virtual/python-pathlib: Enable python3.6
Michał Górny [Thu, 26 Jan 2017 22:29:31 +0000 (23:29 +0100)]
virtual/python-ipaddress: Enable python3.6
Michał Górny [Thu, 26 Jan 2017 22:28:03 +0000 (23:28 +0100)]
virtual/python-futures: Enable python3.6
Michał Górny [Thu, 26 Jan 2017 22:27:29 +0000 (23:27 +0100)]
virtual/python-funcsigs: Enable python3.6
Michał Górny [Thu, 26 Jan 2017 22:26:54 +0000 (23:26 +0100)]
virtual/python-enum34: Enable python3.6
Michał Górny [Thu, 26 Jan 2017 22:26:12 +0000 (23:26 +0100)]
virtual/python-backports_abc: Enable python3.6
Michał Górny [Thu, 26 Jan 2017 22:18:06 +0000 (23:18 +0100)]
virtual/python-asyncio: Remove dead virtual
Michał Górny [Thu, 26 Jan 2017 22:17:41 +0000 (23:17 +0100)]
dev-python/aioeventlet: Wipe deps on virtual/python-asyncio
Michał Górny [Thu, 26 Jan 2017 22:16:51 +0000 (23:16 +0100)]
dev-python/autobahn: Wipe deps on virtual/python-asyncio
Ian Stakenvicius [Thu, 26 Jan 2017 22:23:49 +0000 (17:23 -0500)]
profiles/base/package.use.mask: force off rust on www-client/firefox
Michael Mair-Keimberger (asterix) [Thu, 26 Jan 2017 17:10:31 +0000 (18:10 +0100)]
net-misc/mediatomb: remove unused patches/file
Closes: https://github.com/gentoo/gentoo/pull/3664
Roy Bamford [Thu, 26 Jan 2017 17:45:58 +0000 (17:45 +0000)]
Fine tune the gcc USE=gcj mask so we can have gcj-5.4.0 to bootstrap icedtea
Closes: https://github.com/gentoo/gentoo/pull/3668
Roy Bamford [Thu, 26 Jan 2017 17:42:29 +0000 (17:42 +0000)]
Remove java from use.mask now we have Oracle and icedtea java
Closes: https://github.com/gentoo/gentoo/pull/3668
Roy Bamford [Thu, 26 Jan 2017 12:17:32 +0000 (12:17 +0000)]
media-libs/libart_lgpl:added ~arm64 keyword. Tested on cortex-a53 Dependency of icedtea on arm64
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/3668
Roy Bamford [Thu, 26 Jan 2017 12:14:45 +0000 (12:14 +0000)]
dev-java/ecj-gcj: added ~arm64 keyword. Tested on cortex-a53 Dependency of icedtea on arm64
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/3668
Roy Bamford [Thu, 26 Jan 2017 12:12:19 +0000 (12:12 +0000)]
dev-java/gcj-jdk:added ~arm64 keyword. Tested on cortex-a53 Dependency of icedtea on arm64
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/3668
Roy Bamford [Thu, 26 Jan 2017 12:10:29 +0000 (12:10 +0000)]
sys-apps/baselayout-java: added ~arm64 keyword. Tested on cortex-a53 Dependency of icedtea on arm64
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/3668
Roy Bamford [Thu, 26 Jan 2017 11:54:47 +0000 (11:54 +0000)]
dev-java/ant-core: added ~arm64 keyword. Tested on cortex-a53 Dependency of icedtea on arm64
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/3668
Roy Bamford [Thu, 26 Jan 2017 11:52:09 +0000 (11:52 +0000)]
dev-java/javatoolkit:added ~arm64 keyword. Tested on cortex-a53 Dependency of icedtea on arm64
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/3668
Roy Bamford [Thu, 26 Jan 2017 11:50:14 +0000 (11:50 +0000)]
dev-java/icedtea: added ~arm64 keyword. Tested on cortex-a53
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/3668
Roy Bamford [Thu, 26 Jan 2017 11:48:12 +0000 (11:48 +0000)]
dev-java/icedtea: added ~arm64 keyword. Tested on cortex-a53
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/3668
Roy Bamford [Thu, 26 Jan 2017 11:42:55 +0000 (11:42 +0000)]
dev-util/systemtap:added ~arm64 keyword. Tested on cortex-a53 Dependency of icedtea on arm64
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/3668
Roy Bamford [Thu, 26 Jan 2017 11:40:23 +0000 (11:40 +0000)]
dev-java/icedtea-web:added ~arm64 keyword. Tested on cortex-a53 Dependency of icedtea on arm64
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/3668
Roy Bamford [Thu, 26 Jan 2017 11:37:22 +0000 (11:37 +0000)]
virtual/jdk: added ~arm64 keyword. Tested on cortex-a53 Dependency of icedtea on arm64
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/3668
Roy Bamford [Thu, 26 Jan 2017 11:35:55 +0000 (11:35 +0000)]
virtual/jre: added ~arm64 keyword. Tested on cortex-a53 Dependency of icedtea on arm64
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/3668
Roy Bamford [Thu, 26 Jan 2017 11:33:10 +0000 (11:33 +0000)]
virtual/jre: added ~arm64 keyword. Tested on cortex-a53 Dependency of icedtea on arm64
Package-Manager: Portage-2.3.3, Repoman-2.3.1
RepoMan-Options: --include-arches="arm64"
Closes: https://github.com/gentoo/gentoo/pull/3668
Jorge Manuel B. S. Vicetto (jmbsvicetto) [Thu, 26 Jan 2017 21:47:08 +0000 (20:47 -0100)]
dev-db/phpmyadmin: Add first 4.7 series beta.
Package-Manager: portage-2.3.2
Matthew Thode [Thu, 26 Jan 2017 21:42:33 +0000 (15:42 -0600)]
dev-python/oslo-middleware: stable for bug 606976 CVE-2017-2592
Package-Manager: portage-2.3.3
Matthew Thode [Thu, 26 Jan 2017 21:40:53 +0000 (15:40 -0600)]
dev-python/oslo-middleware: fix CVE-2017-2592 bug 606976
Package-Manager: portage-2.3.3
Jorge Manuel B. S. Vicetto (jmbsvicetto) [Thu, 26 Jan 2017 21:41:00 +0000 (20:41 -0100)]
dev-db/phpmyadmin: Security releases - 4.0.10.19, 4.4.15.10, 4.6.6 (PMASA-2017-{1-7}) - bug 606972.
Package-Manager: portage-2.3.2
Alexis Ballier [Thu, 26 Jan 2017 21:36:03 +0000 (22:36 +0100)]
media-video/ffmpeg: disable sofalizer in non native abis since netcdf is not multilib.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
fhlfibh [Thu, 26 Jan 2017 20:45:01 +0000 (23:45 +0300)]
media-video/ffmpeg: Add USE flag for sofalizer filter
Jory A. Pratt [Thu, 26 Jan 2017 21:26:39 +0000 (15:26 -0600)]
mail-client/thunderbird: Fix keywords on thunderbird-45.7.0
Brian Evans [Thu, 26 Jan 2017 21:19:47 +0000 (16:19 -0500)]
dev-db/innotop: Drop old versions and reference to google-code
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Brian Evans [Thu, 26 Jan 2017 21:17:10 +0000 (16:17 -0500)]
dev-db/innotop: Version bump
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Michał Górny [Thu, 26 Jan 2017 21:15:27 +0000 (22:15 +0100)]
dev-util/sysdig: Bump to 0.14.0
Jory A. Pratt [Thu, 26 Jan 2017 21:05:05 +0000 (15:05 -0600)]
mail-client/thunderbird-bin: Fix keywords on 45.7.0
Jory A. Pratt [Thu, 26 Jan 2017 21:03:08 +0000 (15:03 -0600)]
www-client/firefox{-bin}: Security bump, bug #607138
Jory A. Pratt [Thu, 26 Jan 2017 20:54:03 +0000 (14:54 -0600)]
mail-client/thunderbird{-bin} : security bump, bug #607310
Mike Gilbert [Thu, 26 Jan 2017 20:39:34 +0000 (15:39 -0500)]
net-p2p/transmission: unbundle libb64
Bug: https://bugs.gentoo.org/607336
Package-Manager: Portage-2.3.3_p42, Repoman-2.3.1_p35
Mike Gilbert [Thu, 26 Jan 2017 20:21:25 +0000 (15:21 -0500)]
net-p2p/transmission: remove old
Package-Manager: Portage-2.3.3_p42, Repoman-2.3.1_p35
Brian Evans [Thu, 26 Jan 2017 20:25:23 +0000 (15:25 -0500)]
dev-python/pymysql: Version bump
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Michał Górny [Thu, 26 Jan 2017 20:01:56 +0000 (21:01 +0100)]
net-misc/minissdpd: Add myself as a co-maintainer
Michał Górny [Thu, 26 Jan 2017 20:01:20 +0000 (21:01 +0100)]
net-misc/miniupnpd: Bump to 2.0.
20161216
Michał Górny [Thu, 26 Jan 2017 19:58:22 +0000 (20:58 +0100)]
dev-python/miniupnpc: Bump to 2.0.
20161216
Michał Górny [Thu, 26 Jan 2017 19:37:59 +0000 (20:37 +0100)]
net-libs/miniupnpc: Bump to 2.0.
20161216
Michał Górny [Thu, 26 Jan 2017 19:08:40 +0000 (20:08 +0100)]
net-libs/miniupnpc: Clean old
Michał Górny [Thu, 26 Jan 2017 19:07:41 +0000 (20:07 +0100)]
dev-python/miniupnpc: Clean old
Michał Górny [Thu, 26 Jan 2017 19:01:38 +0000 (20:01 +0100)]
dev-libs/libb64: Bump to 1.2.1 bugfix
Bump to a newer 1.2.1 version found hidden on sourceforge.
Michał Górny [Thu, 26 Jan 2017 18:56:43 +0000 (19:56 +0100)]
sys-fs/duperemove: Bump to 0.11.beta4
Michał Górny [Thu, 26 Jan 2017 18:43:09 +0000 (19:43 +0100)]
net-wireless/blueman: Bump to 2.1.alpha1
Michał Górny [Thu, 26 Jan 2017 18:32:47 +0000 (19:32 +0100)]
net-wireless/blueman: Sync KEYWORDS in the live ebuild
Gerhard Bräunlich [Wed, 25 Jan 2017 21:25:37 +0000 (22:25 +0100)]
sci-libs/vtk: Version bump to 7.1.0
Package-Manager: portage-2.3.0
Closes: https://github.com/gentoo/gentoo/pull/2936
Gerhard Bräunlich [Wed, 25 Jan 2017 21:25:35 +0000 (22:25 +0100)]
sci-libs/vtk: Version bump to 7.0.0, EAPI bump 5 -> 6
Package-Manager: portage-2.3.0
Closes: https://github.com/gentoo/gentoo/pull/2936
Alexis Ballier [Thu, 26 Jan 2017 19:50:00 +0000 (20:50 +0100)]
Merge remote-tracking branch 'github/pr/3514'