Commit Graph

1411 Commits

Author SHA1 Message Date
Mark H Weaver d5ce3594f6
gnu: linux-libre@4.9: Update to 4.9.109.
* gnu/packages/linux.scm (linux-libre-4.9): Update to 4.9.109.
2018-06-18 03:38:11 -04:00
Mark H Weaver 021d6296d8
gnu: linux-libre@4.4: Update to 4.4.138.
* gnu/packages/linux.scm (linux-libre-4.4): Update to 4.4.138.
2018-06-18 03:37:14 -04:00
Marius Bakke ed2ae0dc7f
gnu: strace: Update to 4.23.
* gnu/packages/linux.scm (strace): Update to 4.23.
[source]: Remove obsolete patch.
* gnu/packages/patches/strace-kernel-4.16.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove it.
2018-06-16 21:35:26 +02:00
Marius Bakke cdbcfc113b
gnu: linux-libre: Fix build on AArch64.
* gnu/packages/patches/binutils-aarch64-symbol-relocation.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
* gnu/packages/base.scm (binutils/fixed): New public variable.
* gnu/packages/linux.scm (make-linux-libre)[native-inputs]: On aarch64, define
new ld-wrapper with the above binutils and use it.
2018-06-16 21:35:24 +02:00
Tobias Geerinckx-Rice ad21323c96
gnu: cpuid: Update to 20180519.
* gnu/packages/linux.scm (cpuid): Update to 20180519.
2018-06-15 09:57:17 +02:00
Tobias Geerinckx-Rice d41a5f826d
gnu: light: Return #t from phase.
* gnu/packages/linux.scm (light)[arguments]: End ‘patch-makefile’ phase
with #t.
2018-06-15 09:57:17 +02:00
Tobias Geerinckx-Rice a756fa5ac0
gnu: light: Update to 1.1.
* gnu/packages/linux.scm (light): Update to 1.1.
[source]: Switch to GIT-FETCH.
2018-06-15 09:57:17 +02:00
Tobias Geerinckx-Rice 14b0c49670
gnu: f2fs-tools: Update to 1.10.0.
* gnu/packages/linux.scm (f2fs-tools): Update to 1.10.0.
2018-06-15 09:57:16 +02:00
Mathieu Othacehe a9e7d6564b
gnu: multipath-tools: Fix build.
(multipath-tools)[arguments]: Pass -n to gzip to avoid timestamp related
warnings causing build failures.
2018-06-12 16:13:16 +02:00
Tobias Geerinckx-Rice eca24b2f3d
gnu: linux-pam: Update to 1.3.1.
* gnu/packages/linux.scm (linux-pam): Update to 1.3.1.
[source]: Update upstream URI.
2018-06-12 15:06:22 +02:00
Mark H Weaver 95d9d95a04
gnu: linux-libre: Update to 4.17.1.
* gnu/packages/linux.scm (%linux-libre-version): Update to 4.17.1.
(%linux-libre-hash): Update hash.
2018-06-12 02:57:20 -04:00
Mark H Weaver f3ad05efd9
gnu: linux-libre@4.14: Update to 4.14.49.
* gnu/packages/linux.scm (%linux-libre-4.14-version): Update to 4.14.49.
(%linux-libre-4.14-hash): Update hash.
2018-06-12 02:56:19 -04:00
Marius Bakke a032b4454b
Merge branch 'master' into staging 2018-06-11 23:52:15 +02:00
Marius Bakke b5724230fe
gnu: bluez: Update to 5.50.
* gnu/packages/linux.scm (bluez): Update to 5.50.
2018-06-11 23:45:45 +02:00
Marius Bakke 6e5a6e641a
gnu: efivar: Update to 36.
* gnu/packages/linux.scm (efivar): Update to 36.
2018-06-11 17:54:31 +02:00
Tobias Geerinckx-Rice 14299d21f2
gnu: iproute2: Update to 4.17.0.
* gnu/packages/linux.scm (iproute): Update to 4.17.0.
2018-06-11 14:08:31 +02:00
宋文武 4dd1fb79f7
gnu: Add libnfnetlink.
* gnu/packages/linux.scm (libnfnetlink): New variable.
2018-06-10 22:57:01 +08:00
宋文武 d6fb0985a6
gnu: btrfs-progs: Fix build by disabling tests.
* gnu/packages/linux.scm (btrfs-progs)[#:arguments]: Add '#:tests? #f'.
2018-06-09 17:18:27 +08:00
Mark H Weaver 0b2fd1600f
gnu: linux-libre@4.9: Update to 4.9.107.
* gnu/packages/linux.scm (linux-libre-4.9): Update to 4.9.107.
2018-06-07 23:38:28 -04:00
Mark H Weaver b09dc3b911
gnu: linux-libre@4.4: Update to 4.4.136.
* gnu/packages/linux.scm (linux-libre-4.4): Update to 4.4.136.
2018-06-07 23:37:46 -04:00
Ricardo Wurmus ca8de35e90
Merge branch 'master' into core-updates 2018-06-05 23:44:11 +02:00
Mark H Weaver db89d31876
gnu: linux-libre: Update to 4.17.
* gnu/packages/linux.scm (%linux-libre-version): Update to 4.17.
(%linux-libre-hash): Update hash.
* gnu/packages/aux-files/linux-libre/4.16-arm.conf,
gnu/packages/aux-files/linux-libre/4.16-arm64.conf,
gnu/packages/aux-files/linux-libre/4.16-i686.conf,
gnu/packages/aux-files/linux-libre/4.16-x86_64.conf: Delete files.
* gnu/packages/aux-files/linux-libre/4.17-arm.conf,
gnu/packages/aux-files/linux-libre/4.17-arm64.conf,
gnu/packages/aux-files/linux-libre/4.17-i686.conf,
gnu/packages/aux-files/linux-libre/4.17-x86_64.conf: New files.
* Makefile.am (AUX_FILES): Adjust accordingly.
2018-06-05 17:21:03 -04:00
Mark H Weaver 704051b258
gnu: linux-libre@4.14: Update to 4.14.48.
* gnu/packages/linux.scm (%linux-libre-4.14-version): Update to 4.14.48.
(%linux-libre-4.14-hash): Update hash.
2018-06-05 17:20:57 -04:00
Mark H Weaver 4418c59005
gnu: linux-libre@4.9: Update to 4.9.106.
* gnu/packages/linux.scm (linux-libre-4.9): Update to 4.9.106.
2018-06-05 17:20:53 -04:00
Ludovic Courtès 7394e264fc
gnu: perf: Work around GCC bug.
Works around <https://bugs.gnu.org/31708>.

* gnu/packages/patches/perf-gcc-ice.patch: New patch.
* gnu/packages/linux.scm (perf)[source]: Use it.
* gnu/local.mk (dist_patch_DATA): Add it.
2018-06-04 14:03:54 +02:00
Ricardo Wurmus 59f87b44da
Merge branch 'master' into core-updates 2018-05-31 13:23:49 +02:00
Mark H Weaver 966e9575a3
gnu: linux-libre@4.14: Update to 4.14.47.
* gnu/packages/linux.scm (%linux-libre-4.14-version): Update to 4.14.47.
(%linux-libre-4.14-hash): Update hash.
(linux-libre-arm-generic-4.14, linux-libre-arm-omap2plus-4.14)
(linux-libre-4.14): Remove patch.
2018-05-31 04:17:22 -04:00
Mark H Weaver 55b68174aa
gnu: linux-libre@4.9: Update to 4.9.105.
* gnu/packages/linux.scm (linux-libre-4.9): Update to 4.9.105.
Remove patch.
2018-05-31 04:16:05 -04:00
Mark H Weaver 2aab213e36
gnu: linux-libre@4.4: Update to 4.4.135.
* gnu/packages/linux.scm (linux-libre-4.4): Update to 4.4.135.
Remove patch.
2018-05-31 04:14:57 -04:00
Mark H Weaver 0d6f84aab1
Merge branch 'master' into core-updates 2018-05-31 00:27:03 -04:00
Mark H Weaver 88a3465e4a
gnu: linux-libre: Revert bad upstream patch in 4.14/4.9/4.4 kernels.
Apply the 1-line revert from upstream that was the sole fix in 4.14.47,
4.9.105, and 4.4.135.  Here we cherry-pick the patch until the corresponding
linux-libre versions are released.

* gnu/packages/linux.scm (linux-libre-4.14, linux-libre-4.9)
(linux-libre-arm-generic-4.14, linux-libre-arm-omap2plus-4.14)
(linux-libre-4.4): Add the patch.
2018-05-31 00:23:41 -04:00
Mark H Weaver 370e87fdbb
gnu: linux-libre: Update to 4.16.13.
* gnu/packages/linux.scm (%linux-libre-version): Update to 4.16.13.
(%linux-libre-hash): Update hash.
2018-05-30 14:59:47 -04:00
Mark H Weaver 49e67982eb
gnu: linux-libre@4.14: Update to 4.14.46.
* gnu/packages/linux.scm (%linux-libre-4.14-version): Update to 4.14.46.
(%linux-libre-4.14-hash): Update hash.
2018-05-30 14:58:49 -04:00
Mark H Weaver f9e1c2d72a
gnu: linux-libre@4.9: Update to 4.9.104.
* gnu/packages/linux.scm (linux-libre-4.9): Update to 4.9.104.
2018-05-30 14:58:09 -04:00
Mark H Weaver 13fcbf3cce
gnu: linux-libre@4.4: Update to 4.4.134.
* gnu/packages/linux.scm (linux-libre-4.4): Update to 4.4.134.
2018-05-30 14:57:22 -04:00
Mark H Weaver 341a36b32c
Merge branch 'master' into core-updates 2018-05-30 02:21:29 -04:00
Mark H Weaver 7cb8d092d5
gnu: linux-libre@4.1: Update to 4.1.52.
* gnu/packages/linux.scm (linux-libre-4.1): Update to 4.1.52.
2018-05-29 23:16:14 -04:00
Mark H Weaver 82b695b834
Merge branch 'master' into core-updates 2018-05-28 20:45:37 -04:00
Ricardo Wurmus 3ec07ced8a
gnu: Add singularity.
* gnu/packages/linux.scm (singularity): New variable.
2018-05-28 17:36:09 +02:00
Julien Lepiller 2101cc3fb6
gnu: gnu: Make alsa find its plugins by setting ALSA_PLUGIN_DIR.
* gnu/packages/patches/alsa-lib-add-environment-variable.patch: New
file.
* gnu/packages/linux.scm (alsa-lib)[source]: Use it.
[native-search-paths]: Add ALSA_PLUGIN_DIR.
* gnu/local.mk (dist_patch_DATA): Add it.
2018-05-27 19:05:34 +02:00
Mark H Weaver 1640f16e78
Merge branch 'master' into core-updates 2018-05-27 01:26:09 -04:00
Mark H Weaver a4e45acdc0
gnu: linux-libre: Update to 4.16.12.
* gnu/packages/linux.scm (%linux-libre-version): Update to 4.16.12.
(%linux-libre-hash): Update hash.
2018-05-27 01:23:26 -04:00
Mark H Weaver 52a1379814
gnu: linux-libre@4.14: Update to 4.14.44.
* gnu/packages/linux.scm (%linux-libre-4.14-version): Update to 4.14.44.
(%linux-libre-4.14-hash): Update hash.
2018-05-27 01:22:36 -04:00
Mark H Weaver ce9484d851
gnu: linux-libre@4.9: Update to 4.9.103.
* gnu/packages/linux.scm (linux-libre-4.9): Update to 4.9.103.
2018-05-27 01:21:55 -04:00
Mark H Weaver ab7da7bc39
gnu: linux-libre@4.4: Update to 4.4.133.
* gnu/packages/linux.scm (linux-libre-4.4): Update to 4.4.133.
2018-05-27 01:20:01 -04:00
Pierre Neidhardt 914205214c
gnu: ntfs-3g: Link 'mount.ntfs' to 'mount.ntfs-3g'.
* gnu/packages/linux.scm (ntfs-3g)[arguments]: Add #:phases.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2018-05-24 23:38:47 +02:00
Mark H Weaver 9d10a63402
Merge branch 'master' into core-updates 2018-05-24 02:34:08 -04:00
Mark H Weaver b7290048ea
gnu: linux-libre: Update to 4.16.11.
* gnu/packages/linux.scm (%linux-libre-version): Update to 4.16.11.
(%linux-libre-hash): Update hash.
2018-05-24 01:15:22 -04:00
Mark H Weaver a75702d242
gnu: linux-libre@4.14: Update to 4.14.43.
* gnu/packages/linux.scm (%linux-libre-4.14-version): Update to 4.14.43.
(%linux-libre-4.14-hash): Update hash.
2018-05-24 01:14:34 -04:00
Mark H Weaver 24c9d8b084
gnu: linux-libre@4.9: Update to 4.9.102.
* gnu/packages/linux.scm (linux-libre-4.9): Update to 4.9.102.
2018-05-24 01:13:34 -04:00
Leo Famulari ad3068b5f1
gnu: procps: Update to 3.3.15 [fixes CVE-2018-{1122,1123,1124,1125,1126}].
* gnu/packages/linux.scm (procps): Update to 3.3.15.
2018-05-23 20:47:30 -04:00
Mark H Weaver ab9da9ec66
Merge branch 'master' into core-updates 2018-05-21 13:41:18 -04:00
Leo Famulari 4699ffa383
gnu: procps: Update to 3.3.14.
* gnu/packages/linux.scm (procps): Update to 3.3.14.
[arguments]: Remove obsolete phase 'disable-strtod-test' because the change has
been upstreamed.
2018-05-21 13:34:18 -04:00
Mark H Weaver 0661758e13
Merge branch 'master' into core-updates 2018-05-21 13:22:32 -04:00
Mark H Weaver c036959b1a
gnu: linux-libre: Update to 4.16.10.
* gnu/packages/linux.scm (%linux-libre-version): Update to 4.16.10.
(%linux-libre-hash): Update hash.
2018-05-21 13:20:18 -04:00
Mark H Weaver b1bb1e8429
gnu: linux-libre@4.14: Update to 4.14.42.
* gnu/packages/linux.scm (%linux-libre-4.14-version): Update to 4.14.42.
(%linux-libre-4.14-hash): Update hash.
2018-05-21 13:19:33 -04:00
Mark H Weaver e205afbd1c
gnu: linux-libre@4.9: Update to 4.9.101.
* gnu/packages/linux.scm (linux-libre-4.9): Update to 4.9.101.
2018-05-21 13:18:41 -04:00
Vagrant Cascadian 5a9dc4a807
gnu: linux-libre: Enable build for aarch64-linux.
* gnu/packages/linux.scm (%linux-compatible-systems): Add aarch64-linux.
  (linux-libre-4.14): Limit to x86_64-linux, i686-linux and armhf-linux.
* gnu/packages/aux-files/linux-libre/4.16-arm64.conf: New file.
* Makefile.am (AUX_FILES): Add 4.16-arm64.conf.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2018-05-21 00:12:02 +02:00
Vagrant Cascadian a8e3fd5f9d
gnu: linux-libre: Use "make dtbs_install" to install device tree files.
* gnu/packages/linux.scm (make-linux-libre):
  Use "make dtbs_install" to install device tree files.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2018-05-20 23:36:59 +02:00
Mark H Weaver 539bf8f2c0
Merge branch 'master' into core-updates 2018-05-17 01:00:50 -04:00
Mark H Weaver 2cf8531f36
gnu: linux-libre: Update to 4.16.9.
* gnu/packages/linux.scm (%linux-libre-version): Update to 4.16.9.
(%linux-libre-hash): Update hash.
2018-05-17 00:49:58 -04:00
Mark H Weaver 22d466737d
gnu: linux-libre@4.14: Update to 4.14.41.
* gnu/packages/linux.scm (%linux-libre-4.14-version): Update to 4.14.41.
(%linux-libre-4.14-hash): Update hash.
2018-05-17 00:49:11 -04:00
Mark H Weaver c0bd585835
gnu: linux-libre@4.9: Update to 4.9.100.
* gnu/packages/linux.scm (linux-libre-4.9): Update to 4.9.100.
2018-05-17 00:48:32 -04:00
Mark H Weaver 029dd51d8c
gnu: linux-libre@4.4: Update to 4.4.132.
* gnu/packages/linux.scm (linux-libre-4.4): Update to 4.4.132.
2018-05-17 00:47:40 -04:00
Tobias Geerinckx-Rice b85c1858ac
gnu: libnftnl: Update to 1.1.0.
* gnu/packages/linux.scm (libnftnl): Update to 1.1.0.
2018-05-17 01:01:59 +02:00
Tobias Geerinckx-Rice f3afef52f6
gnu: rng-tools: Use INVOKE.
* gnu/packages/linux.scm (rng-tools)[arguments]: Substitute INVOKE for
SYSTEM* and explicitly return #t from phase.
2018-05-17 01:01:58 +02:00
Tobias Geerinckx-Rice 41c77ba3ff
gnu: rng-tools: Update to 6.2.
* gnu/packages/linux.scm (rng-tools): Update to 6.2.
2018-05-17 01:01:58 +02:00
Tobias Geerinckx-Rice 7c52558154
gnu: usbutils: Update to 010.
* gnu/packages/linux.scm (usbutils): Update to 010.
2018-05-17 01:01:57 +02:00
Mark H Weaver 0d0b572286
gnu: linux-libre: Update to 4.16.8.
* gnu/packages/linux.scm (%linux-libre-version): Update to 4.16.8.
(%linux-libre-hash): Update hash.
2018-05-12 04:00:17 -04:00
Mark H Weaver 7187669a81
gnu: linux-libre@4.14: Update to 4.14.40.
* gnu/packages/linux.scm (%linux-libre-4.14-version): Update to 4.14.40.
(%linux-libre-4.14-hash): Update hash.
2018-05-12 03:59:22 -04:00
Mark H Weaver 3944e13a72
gnu: linux-libre@4.9: Update to 4.9.99.
* gnu/packages/linux.scm (linux-libre-4.9): Update to 4.9.99.
2018-05-12 03:58:14 -04:00
Danny Milosavljevic 72aa295e44
gnu: Add f2fs-tools@1.7.0.
* gnu/packages/linux.scm (f2fs-tools-1.7): New variable.
(f2fs-tools): Inherit from f2fs-tools-1.7.
2018-05-09 19:13:22 +02:00
Mark H Weaver aedc6e9fc9
Merge branch 'master' into core-updates 2018-05-08 18:45:39 -04:00
Marius Bakke 6e7be7d37a
gnu: strace: Fix build failure on Linux-Libre 4.16.
* gnu/packages/patches/strace-kernel-4.16.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
* gnu/packages/linux.scm (strace)][source](patches): New field.
2018-05-06 21:05:11 +02:00
Marius Bakke 12bd588346
Merge branch 'master' into core-updates 2018-05-06 15:56:24 +02:00
Mark H Weaver a937148b77
gnu: linux-libre: Update to 4.16.7.
* gnu/packages/linux.scm (%linux-libre-version): Update to 4.16.7.
(%linux-libre-hash): Update hash.
2018-05-03 01:34:03 -04:00
Mark H Weaver 27b3fb2cc3
gnu: linux-libre@4.14: Update to 4.14.39.
* gnu/packages/linux.scm (%linux-libre-4.14-version): Update to 4.14.39.
(%linux-libre-4.14-hash): Update hash.
2018-05-03 01:33:01 -04:00
Mark H Weaver c0e8f0493a
gnu: linux-libre@4.9: Update to 4.9.98.
* gnu/packages/linux.scm (linux-libre-4.9): Update to 4.9.98.
2018-05-03 01:32:19 -04:00
Mark H Weaver 9e19c343c7
gnu: linux-libre@4.4: Update to 4.4.131.
* gnu/packages/linux.scm (linux-libre-4.4): Update to 4.4.131.
2018-05-03 01:31:04 -04:00
Marius Bakke 87dc306bfe
gnu: libaio: Update to 0.3.111.
* gnu/packages/linux.scm (libaio): Update to 0.3.111.
[source]: Download from new home.
[home-page]: Change to pagure.io/libaio.
2018-05-02 13:23:30 +02:00
Marius Bakke fb5b359d77
gnu: inotify-tools: Update to 3.20.1.
* gnu/packages/linux.scm (inotify-tools): Update to 3.20.1.
[source]: Download from new home.  Set file-name.
[native-inputs]: Add AUTOCONF, AUTOMAKE and LIBTOOL.
[arguments]: Add 'bootstrap' phase.
[home-page]: Update to redirected.
2018-05-02 13:03:33 +02:00
Rutger Helling 7d5adf0131
gnu: e2fsprogs: Fix build with glibc-2.27.
* gnu/packages/patches/e2fsprogs-glibc-2.27.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/linux.scm (e2fsprogs)[source]: Add patch.
2018-05-02 10:11:43 +02:00
Mark H Weaver f0ae90cbbb
Merge branch 'master' into core-updates 2018-04-30 16:48:15 -04:00
Marius Bakke a66853810e
Merge branch 'staging' 2018-04-30 19:26:03 +02:00
Mark H Weaver 3d5ad159b3
Merge branch 'master' into core-updates 2018-04-30 04:03:54 -04:00
Mark H Weaver 8c21c64e59
gnu: linux-libre: Update to 4.16.6.
* gnu/packages/linux.scm (%linux-libre-version): Update to 4.16.6.
(%linux-libre-hash): Update hash.
2018-04-30 03:27:52 -04:00
Mark H Weaver 7be01574b7
gnu: linux-libre@4.14: Update to 4.14.38.
* gnu/packages/linux.scm (%linux-libre-4.14-version): Update to 4.14.38.
(%linux-libre-4.14-hash): Update hash.
2018-04-30 03:26:56 -04:00
Mark H Weaver f34ea4afdd
gnu: linux-libre@4.9: Update to 4.9.97.
* gnu/packages/linux.scm (linux-libre-4.9): Update to 4.9.97.
2018-04-30 03:26:01 -04:00
Mark H Weaver 3026c61077
gnu: linux-libre@4.4: Update to 4.4.130.
* gnu/packages/linux.scm (linux-libre-4.4): Update to 4.4.130.
2018-04-30 03:25:23 -04:00
Tobias Geerinckx-Rice fb9232d717
gnu: cpuid: Update to 20180419.
* gnu/packages/linux.scm (cpuid): Update to 20180419.
2018-04-27 02:56:44 +02:00
Rouby Pierre-Antoine 2690b6ce7d
gnu: Add libpfm4.
* gnu/packages/linux.scm (libpfm4): New variable.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2018-04-26 16:10:30 +02:00
Rouby Pierre-Antoine 25637b770e
gnu: Add psm2.
* gnu/packages/linux.scm (psm2): New variable.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2018-04-26 16:10:30 +02:00
Marius Bakke a9fe3882b9
Merge branch 'master' into staging 2018-04-25 15:53:41 +02:00
Marius Bakke 0afeda6521
gnu: multipath-tools: Update to 0.7.6.
* gnu/packages/linux.scm (multipath-tools): Update to 0.7.6.
2018-04-25 15:09:22 +02:00
Mark H Weaver ba39d32807
gnu: linux-libre: Update to 4.16.4.
* gnu/packages/linux.scm (%linux-libre-version): Update to 4.16.4.
(%linux-libre-hash): Update hash.
2018-04-24 16:53:53 -04:00
Mark H Weaver feb477869e
gnu: linux-libre@4.14: Update to 4.14.36.
* gnu/packages/linux.scm (%linux-libre-4.14-version): Update to 4.14.36.
(%linux-libre-4.14-hash): Update hash.
2018-04-24 16:53:51 -04:00
Mark H Weaver 22789d97b0
gnu: linux-libre@4.9: Update to 4.9.96.
* gnu/packages/linux.scm (linux-libre-4.9): Update to 4.9.96.
2018-04-24 16:53:49 -04:00
Mark H Weaver 005ccea624
gnu: linux-libre@4.4: Update to 4.4.129.
* gnu/packages/linux.scm (linux-libre-4.4): Update to 4.4.129.
2018-04-24 16:53:47 -04:00
Efraim Flashner c80629e7c2
gnu: freefall: Fix compilation error.
* gnu/packages/linux.scm (freefall)[arguments]: Add make-flag to set
CC=gcc.
2018-04-21 23:04:25 +03:00
Mark H Weaver c52872bfc4
Merge branch 'master' into core-updates 2018-04-21 05:02:52 -04:00