Commit Graph

23067 Commits (ce2cfcabfccbd6062ab4029258ab61b308508c62)

Author SHA1 Message Date
Marius Bakke 01af1e11a6
gnu: python2-flake8: Fix python-enum34 propagation.
* gnu/packages/python.scm (python2-flake8)[propagated-inputs]: Replace
PYTHON2-ENUM with PYTHON2-ENUM34.
2018-02-07 15:34:09 +01:00
Marius Bakke 9e94d063ab
gnu: multiqc: Update to 1.4.
* gnu/packages/bioinformatics.scm (multiqc): Update to 1.4.
[propagated-inputs]: Remove PYTHON-ENUM34.
2018-02-07 15:34:08 +01:00
Ricardo Wurmus 799c3c868f
gnu: sablevm: Fix broken build.
* gnu/packages/java.scm (sablevm)[arguments]: Change threading type.
2018-02-06 23:15:35 +01:00
Tobias Geerinckx-Rice 5ac1143dc4
gnu: whois: Expand synopsis & description.
* gnu/packages/networking.scm (whois)[synopsis, description]: Expand.
2018-02-06 20:02:12 +01:00
Tobias Geerinckx-Rice 11b1f89ec2
gnu: librep: Update to 0.92.7.
* gnu/packages/sawfish.scm (librep): Update to 0.92.7.
2018-02-06 20:02:12 +01:00
Tobias Geerinckx-Rice ccfe4aa1c0
gnu: asciidoc: Update to 8.6.10.
* gnu/packages/documentation.scm (asciidoc): Update to 8.6.10.
[source]: Switch to new code host.
[arguments]: Add new ‘bootstrap’ phase...
[native-inputs]: ...and required autoconf.
[home-page]: Point to a more recently updated instance.
2018-02-06 20:02:12 +01:00
Tobias Geerinckx-Rice 1ffa065c44
gnu: perl-test-simple: Update to 1.302122.
* gnu/packages/perl-check.scm (perl-test-simple): Update to 1.302122.
2018-02-06 20:02:11 +01:00
Christopher Baines 8db8bf921d
gnu: build: linux-boot: Remove bind-mount export.
bind-mount is not contained within this module.

* gnu/build/linux-boot.scm: Remove bind-mount export.
2018-02-06 17:19:28 +00:00
Ludovic Courtès 71e789319c
gnu: hwloc: Add 2.0.0.
* gnu/packages/mpi.scm (hwloc-2.0): New variable.
* gnu/packages/patches/hwloc-tests-without-sysfs.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
2018-02-06 17:34:34 +01:00
Oleg Pykhalov fbcad8843a
gnu: Add python-pyaudio.
* gnu/packages/audio.scm (python-pyaudio): New public variable.
2018-02-06 19:16:51 +03:00
Stefan Reichör 19d93ef537
gnu: Add curseradio.
* gnu/packages/music.scm (curseradio): New variable.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2018-02-06 17:02:46 +01:00
Ludovic Courtès 9805ad6f87
gnu: julia: Don't invoke /sbin/ldconfig.
Reported by Marco van Hulten <marco@hulten.org>
in <https://bugs.gnu.org/30282>.

* gnu/packages/julia.scm (julia)[arguments] <'hardcode-soname-map>:
Patch out 'ldconfig' invocations.
2018-02-06 16:12:50 +01:00
Ludovic Courtès d40b5684c5
gnu: julia: Adjust libgit2 tests.
* gnu/packages/julia.scm (julia)[arguments] <'disable-broken-tests>:
Patch libgit2.jl.
2018-02-06 16:12:50 +01:00
Ludovic Courtès 4e847986bc
gnu: libssh: Update to commit 239d0f7 of branch 'v0-7'.
* gnu/packages/ssh.scm (libssh): Update to 239d0f7.
2018-02-06 16:12:50 +01:00
Mathieu Othacehe 924b96db0a
gnu: gpsbabel: Update to 1.5.4 and fix build.
* gnu/packages/patches/gpsbabel-minizip.patch: New file.
* gnu/packages/patches/gpsbabel-qstring.patch: New file.
* gnu/local.mk (dist_patch_DATA): Update accordingly.
* gnu/packages/gps.scm (gpsbabel): Update to 1.5.4,
[source]: add two previous patches to fix build,
[snippet]: remove "gpsbabel" directory excursion,
[arguments]: ditto.
2018-02-06 15:50:09 +01:00
Mathieu Othacehe 5365596476
gnu: Add gpxsee.
* gnu/packages/gps.scm (gpxsee): New variable.
2018-02-06 15:50:04 +01:00
Tobias Geerinckx-Rice 9cc03bbf0d
gnu: expect: Update to 5.45.4.
* gnu/packages/tcl.scm (expect): Update to 5.45.4.
2018-02-06 14:42:46 +01:00
Tobias Geerinckx-Rice 0e588d2f02
gnu: shotwell: Update to 0.27.4.
* gnu/packages/gnome.scm (shotwell): Update to 0.27.4.
2018-02-06 14:42:46 +01:00
Konrad Hinsen 4283653cb0
gnu: Add python-isoweek.
* gnu/packages/python.scm (python-isoweek, python2-isoweek): New variables.

Signed-off-by: Danny Milosavljevic <dannym@scratchpost.org>
2018-02-06 12:10:17 +01:00
Danny Milosavljevic 7e2dd00bfb
gnu: Add python-funcy.
* gnu/packages/python.scm (python-funcy, python2-funcy): New variables.
2018-02-06 12:04:21 +01:00
Danny Milosavljevic 89c57efd78
gnu: Add python-whatever.
* gnu/packages/python.scm (python-whatever, python2-whatever): New variables.
2018-02-06 12:04:19 +01:00
Ricardo Wurmus e9e78d2cec
gnu: Add r-heatmaply.
* gnu/packages/cran.scm (r-heatmaply): New variable.
2018-02-06 11:21:57 +01:00
Ricardo Wurmus 2e9d187b87
gnu: Add r-seriation.
* gnu/packages/cran.scm (r-seriation): New variable.
2018-02-06 11:21:56 +01:00
Ricardo Wurmus 8e5e26d2ab
gnu: Add r-webshot.
* gnu/packages/cran.scm (r-webshot): New variable.
2018-02-06 11:21:56 +01:00
Ricardo Wurmus 7fe49f2a8a
gnu: Add r-gclus.
* gnu/packages/cran.scm (r-gclus): New variable.
2018-02-06 11:21:56 +01:00
Ricardo Wurmus ffb59bcef7
gnu: Add r-qap.
* gnu/packages/cran.scm (r-qap): New variable.
2018-02-06 11:21:56 +01:00
Ricardo Wurmus f285346aed
gnu: Add r-tsp.
* gnu/packages/cran.scm (r-tsp): New variable.
2018-02-06 11:21:56 +01:00
Ricardo Wurmus 2058e37d61
gnu: Add r-processx.
* gnu/packages/cran.scm (r-processx): New variable.
2018-02-06 11:21:56 +01:00
Ricardo Wurmus a3257d427e
gnu: Add r-debugme.
* gnu/packages/cran.scm (r-debugme): New variable.
2018-02-06 11:21:56 +01:00
Danny Milosavljevic 18adb1f00d
gnu: guile-sqlite3: Use git-version.
* gnu/packages/guile.scm [version]: Use git-version.
2018-02-06 09:49:08 +01:00
Danny Milosavljevic 0362e5820a
gnu: guile-sqlite3: Update to 0.0-2.21f35ca.
* gnu/packages/guile.scm (guile-sqlite3): Update to 0.0-2.21f35ca.
2018-02-06 09:01:41 +01:00
Leo Famulari 127dc7c7be
gnu: python-llfuse: Update to 1.3.2.
* gnu/packages/python.scm (python-llfuse, python2-llfuse): Update to 1.3.2.
2018-02-05 20:16:48 -05:00
Ethan R. Jones 956ba99cb7
gnu: Add python-gyp.
* gnu/packages/python.scm (python-gyp, python2-gyp): New variables.
2018-02-05 18:04:34 -05:00
Kei Kebreau 26ecbaf866
gnu: bigloo: Update to 4.3b.
* gnu/packages/scheme.scm (bigloo): Update to 4.3b.
[arguments]: Add "--disable-patch" to configure flags.  Add substitution to
compile Bigloo with the correct runpath. Substitute 'invoke' for '*system*'.
2018-02-05 17:13:56 -05:00
Leo Famulari a630c64709
gnu: p7zip: Fix CVE-2017-17969.
* gnu/packages/patches/p7zip-CVE-2017-17969.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/compression.scm (p7zip)[source]: Use it.
2018-02-05 16:21:40 -05:00
Maxim Cournoyer b1968d86b9
gnu: Add emacs-realgud.
* gnu/packages/emacs.scm (emacs-realgud): New public variable.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2018-02-05 16:54:28 +01:00
Maxim Cournoyer fd38bfe23b
gnu: Add emacs-loc-changes.
* gnu/packages/emacs.scm (emacs-loc-changes): New public variable.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2018-02-05 16:54:27 +01:00
Maxim Cournoyer fa1a17b786
gnu: Add emacs-load-relative.
* gnu/packages/emacs.scm (emacs-load-relative): New public variable.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2018-02-05 16:54:27 +01:00
Maxim Cournoyer 439ad15ddd
gnu: Add emacs-test-simple.
* gnu/packages/emacs.scm (emacs-test-simple): New public variable.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2018-02-05 16:54:27 +01:00
Marius Bakke 76dbb7516e
gnu: miniupnpc: Update to 2.0.20180203.
* gnu/packages/upnp.scm (miniupnpc): Update to 2.0.20180203.
2018-02-05 15:40:52 +01:00
Nicolas Goaziou 20c65aa1ec
gnu: solfege: Fix typo.
* gnu/packages/music.scm (solfege): Fix typo in `fix-configuration' phase.
2018-02-05 14:35:01 +01:00
Rutger Helling 4284d04d2e
gnu: xpra: Update to 2.2.4.
* gnu/packages/xorg.scm (xpra): Update to 2.2.4.
2018-02-05 14:29:10 +01:00
Leo Famulari b6f7a4076e
gnu: oil-shell: Update to 0.4.0.
* gnu/packages/shells.scm (oil-shell): Update to 0.4.0.
2018-02-05 04:56:25 -05:00
Arun Isaac 710d889d57
gnu: htop: Update to 2.1.0.
* gnu/packages/admin.scm (htop): Update to 2.1.0.
[native-inputs]: Add python-minimal-wrapper.
[home-page]: Update URI.
2018-02-05 15:02:35 +05:30
Oleg Pykhalov 555a7429ee
gnu: emacs-helm-make: Update to 0.1.0-1.feae8df.
* gnu/packages/emacs.scm (emacs-helm-make): Update to 0.1.0-1.feae8df.
2018-02-05 09:55:21 +03:00
Tobias Geerinckx-Rice 67f002520c
gnu: nginx-documentation: Update to 2018-01-22-2100-cfb7bd672d77.
* gnu/packages/web.scm (nginx-documentation): Update to
2018-01-22-2100-cfb7bd672d77.
2018-02-04 19:22:34 +01:00
Tobias Geerinckx-Rice 5de4653ded
gnu: libmicrohttpd: Update to 0.9.59.
* gnu/packages/gnunet.scm (libmicrohttpd): Update to 0.9.59.
2018-02-04 19:22:34 +01:00
Tobias Geerinckx-Rice 5a719deedc
gnu: zstd: Fix typo in comment.
* gnu/packages/compression.scm (zstd)[license]: Fix comment typo.
2018-02-04 19:22:33 +01:00
Tobias Geerinckx-Rice af147cddd4
gnu: rtags: Update to 2.18.
* gnu/packages/code.scm (rtags): Update to 2.18.
2018-02-04 19:22:33 +01:00
Efraim Flashner 2fe05cb6e1
gnu: myrepos: Update to 1.20171231.
* gnu/packages/version-control.scm (myrepos): Update to 1.20171231.
2018-02-04 20:09:32 +02:00
Mark H Weaver 919d1f267b
Merge branch 'master' into core-updates 2018-02-04 00:13:42 -05:00
Mark H Weaver 930ebe14e1
gnu: linux-libre: Update to 4.15.1.
* gnu/packages/linux.scm (%linux-libre-version): Update to 4.15.1.
(%linux-libre-hash): Update hash.
2018-02-04 00:05:33 -05:00
Mark H Weaver 026eaa9382
gnu: linux-libre@4.14: Update to 4.14.17.
* gnu/packages/linux.scm (%linux-libre-4.14-version): Update to 4.14.17.
(%linux-libre-4.14-hash): Update hash.
2018-02-04 00:04:45 -05:00
Mark H Weaver 97178e2fa6
gnu: linux-libre@4.9: Update to 4.9.80.
* gnu/packages/linux.scm (linux-libre-4.9): Update to 4.9.80.
2018-02-04 00:04:12 -05:00
Mark H Weaver 6fe56202bc
gnu: linux-libre@4.4: Update to 4.4.115.
* gnu/packages/linux.scm (linux-libre-4.4): Update to 4.4.115.
2018-02-04 00:03:37 -05:00
Mark H Weaver e7ca634912
Merge branch 'master' into core-updates 2018-02-03 22:46:07 -05:00
Nicolas Goaziou 0903a51769
gnu: giac-xcas: Update to 1.4.9-45.
* gnu/packages/algebra.scm (giac-xcas): Update to 1.4.9-45.
2018-02-04 00:42:36 +01:00
Mathieu Othacehe 03392caace
gnu: gpsbabel: Add missing module.
* gnu/packages/gps.scm (gpsbabel)[source]: Add (guix build utils) module for
"with-directory-excursion" macro.
2018-02-03 21:39:54 +01:00
Efraim Flashner f860204637
gnu: Add culmus.
* gnu/packages/fonts.scm (culmus): New variable.
2018-02-03 20:57:14 +02:00
Oleg Pykhalov 0698633dd8
gnu: emacs-browse-at-remote: Update to 0.9.0-1.31dcf77.
* gnu/packages/emacs.scm (emacs-browse-at-remote): Update to 0.9.0-1.31dcf77.
2018-02-03 00:11:41 +03:00
Tobias Geerinckx-Rice 66ab28bb73
gnu: ncdu: Update to 1.13.
* gnu/packages/ncdu.scm (ncdu): Update to 1.13.
2018-02-02 17:48:43 +01:00
Tobias Geerinckx-Rice 4b179fb2e6
gnu: man-pages: Update to 4.15.
* gnu/packages/man.scm (man-pages): Update to 4.15.
2018-02-02 17:48:43 +01:00
Tobias Geerinckx-Rice b8181163a5
gnu: cfitsio: Use HTTPS home page.
* gnu/packages/astronomy.scm (cfitsio)[home-page]: Use HTTPS.
2018-02-02 17:44:42 +01:00
Jelle Licht b0881e0b55
gnu: node: Update to 9.4.0.
* gnu/packages/node.scm (node): Update to 9.4.0.
[arguments]: Remove all tests that depend on eslint being available. Remove
reference to deleted test. Removed networking test.
2018-02-02 17:21:06 +01:00
Efraim Flashner 0c8c97f45d
gnu: ethtool: Update to 4.15.
* gnu/packages/networking.scm (ethtool): Update to 4.15.
2018-02-02 18:10:02 +02:00
Eric Bavier c684008992
gnu: slepc: Apply invoke to configure flags.
Follow-up to 94a1eb96d3

* gnu/packages/maths.scm (slepc)[arguments]: Use 'apply' since 'flags' is a
list of configure arguments.
2018-02-02 08:26:59 -06:00
Eric Bavier e01397b489
gnu: Add Elemental.
* gnu/packages/maths.scm (elemental): New variable.
2018-02-02 08:26:59 -06:00
Eric Bavier cbc084e1a7
gnu: Add QD.
* gnu/packages/multiprecision.scm (qd): New variable.
2018-02-02 08:26:59 -06:00
Ludovic Courtès 02267798de
gnu: Add emacs-org-tree-slide.
Thanks, Pjotr & Ricardo!  :-)

* gnu/packages/emacs.scm (org-tree-slide): New variable.
2018-02-02 15:00:48 +01:00
Ben Woodcroft 7502badb81
gnu: diamond: Update to 0.9.17.
* gnu/packages/bioinformatics.scm (diamond): Update to 0.9.17.
2018-02-02 23:04:46 +10:00
Mark Meyer a9b3476239
gnu: Add fann.
* gnu/packages/machine-learning.scm (fann): New variable.

Co-authored-by: Ben Woodcroft <donttrustben@gmail.com>
2018-02-02 23:04:46 +10:00
Efraim Flashner 9b94ced45c
gnu: u-boot: Remove surplus flag in 'install phase.
* gnu/packages/bootloaders.scm (u-boot)[arguments]: Remove 'make-flags
key from custom 'install phase.
2018-02-02 12:18:22 +02:00
Efraim Flashner f8aa265e08
gnu: linux-libre: Fix home-page url.
* gnu/packages/linux.scm (linux-libre)[home-page]: Remove duplicate
forward slash.
2018-02-02 12:18:22 +02:00
Leo Famulari bb9cd6de32
gnu: blender: Fix build by specifying path to Python libraries.
* gnu/packages/graphics.scm (blender)[arguments]: Specify the Python
dependency paths in #:configure-flags.
[inputs]: Replace python-wrapper with python.
2018-02-01 18:09:35 -05:00
ng0 a3a932c008
gnu: xorriso: Remove 'bzip2' and 'libcdio' from inputs.
Thomas Schmitt suggested in bug#28398 to apply these changes. Neither of these
inputs are referenced by the output store item.

* gnu/packages/cdrom.scm (xorriso)[inputs]: Remove 'bzip2' and 'libcdio'.

Signed-off-by: Christopher Baines <mail@cbaines.net>
2018-02-01 22:49:54 +00:00
ng0 53e1b30e0c
gnu: Add xfburn.
* gnu/packages/xfce.scm (xfburn): New variable.

Signed-off-by: Christopher Baines <mail@cbaines.net>
2018-02-01 22:49:54 +00:00
ng0 dbfab26dac
gnu: Add libisofs.
* gnu/packages/cdrom.scm (libisofs): New variable.

Signed-off-by: Christopher Baines <mail@cbaines.net>
2018-02-01 22:49:54 +00:00
ng0 1d8e04e64b
gnu: Add libburn.
* gnu/packages/cdrom.scm (libburn): New variable.

Signed-off-by: Christopher Baines <mail@cbaines.net>
2018-02-01 22:49:50 +00:00
Peter Kreye bff6739d5e
gnu: ocaml-findlib: Update to 1.7.3.
* gnu/packages/ocaml.scm (ocaml-findlib): Update to 1.7.3.
* gnu/packages/ocaml.scm (ocaml-findlib-1.7.3): Removed.

Signed-off-by: Julien Lepiller <julien@lepiller.eu>
2018-02-01 23:09:29 +01:00
Peter Kreye a9e9fd1506
gnu: Add ocaml-tsdl.
* gnu/packages/ocaml.scm (ocaml-tsdl): New variable.

Signed-off-by: Julien Lepiller <julien@lepiller.eu>
2018-02-01 23:09:23 +01:00
Peter Kreye c98c823704
gnu: Add ocaml-ocb-stubblr.
* gnu/packages/ocaml.scm (ocaml-ocb-stubblr): New variable.

Signed-off-by: Julien Lepiller <julien@lepiller.eu>
2018-02-01 23:09:21 +01:00
Peter Kreye 69d08bb131
gnu: Add ocaml-ctypes.
* gnu/packages/ocaml.scm (ocaml-ctypes): New variable.

Signed-off-by: Julien Lepiller <julien@lepiller.eu>
2018-02-01 23:09:19 +01:00
Peter Kreye edac535493
gnu: Add ocaml-integers.
* gnu/packages/ocaml.scm (ocaml-integes): New variable.

Signed-off-by: Julien Lepiller <julien@lepiller.eu>
2018-02-01 23:09:16 +01:00
Peter Kreye 2b4d2a4d0a
gnu: ocaml-findlib-1.7.3: Fix install.
* gnu/packages/ocaml.scm (ocaml-findlib-1.7.3): install topfind to
lib/ocaml/site-lib

Signed-off-by: Julien Lepiller <julien@lepiller.eu>
2018-02-01 23:09:08 +01:00
Nicolas Goaziou 95e545a4da
gnu: solfege: Make configuration more robust to GC
* gnu/packages/music.scm (solfege): Do not introduce store filenames in the
configuration skeleton.
[inputs]: Remove optional players.
2018-02-01 22:38:42 +01:00
Leo Famulari 537a17fbe8
gnu: Add copyright statement for Alex Vong.
This is a followup to commit 20be64dcf7.

* gnu/packages/base.scm: Add copyright statement.
2018-02-01 16:14:41 -05:00
Leo Famulari eb096cdeba
gnu: libreoffice: Fix build with Poppler >= 0.62.0.
* gnu/packages/libreoffice.scm (libreoffice)[arguments]: Patch header and
function names in 'prepare-src' phase.
2018-02-01 15:50:25 -05:00
Christopher Baines 9b32bf6e6c
gnu: Fix and improve the mongo-tools package.
The hash of the source for this package is wrong. Most probably because the
source was changed from a tarball to a git repository without updating the
hash. Fixing this seems to break the check phase, so I rewrote that as well,
making changes to the build and install phases as needed.

* gnu/packages/databases.scm (mongo-tools)[source]: Update the hash value.
  [arguments]: Remove the different unpack path, as this isn't necessary when
  using the git repository as a source. Move the list of tools to make it
  accessible from multiple phases. Rewrite the build phase, getting it to
  install the tools in to the location the tests seem to expect to find
  them. Replace the check phase to run the tests for each tool
  individually. Add an install phase to install the tools, now that go install
  is not being run in the build phase.
  [native-inputs]: Add go-github.com-smartystreets-goconvey as a native-input
  as this is required for running the tests.
2018-02-01 20:21:25 +00:00
Christopher Baines 8d54ace78e
gnu: Add go-github.com-smartystreets-goconvey.
* gnu/packages/check.scm (go-github.com-smartystreets-goconvey): New variable.
2018-02-01 20:21:25 +00:00
Christopher Baines da6f9d41c1
gnu: Add go-github.com-jtolds-gls.
* gnu/packages/golang.scm (go-github.com-jtolds-gls): New variable.
2018-02-01 20:21:25 +00:00
Christopher Baines 7952804cec
gnu: Add go-github.com-smartystreets-assertions.
* gnu/packages/check.scm (go-github.com-smartystreets-assertions): New
  variable.
2018-02-01 20:21:24 +00:00
Christopher Baines bee3012549
gnu: Add go-github.com-smartystreets-gunit.
* gnu/packages/check.scm (go-github.com-smartystreets-gunit): New variable.
2018-02-01 20:21:22 +00:00
David Thompson e543e8c0e7
gnu: awscli: Update to 1.14.32.
* gnu/packages/python-web.scm (awscli): Update to 1.14.32.
2018-02-01 14:09:41 -05:00
David Thompson beacd8a07c
gnu: python-botocore: Update to 1.8.36.
* gnu/packages/python.scm (python-botocore): Update to 1.8.36.
2018-02-01 14:09:41 -05:00
Marius Bakke 04941fc550
gnu: python-django: Use the test-only tzdata package for tests.
* gnu/packages/django.scm (python-django)[native-inputs]: Replace TZDATA with
TZDATA-FOR-TESTS.
2018-02-01 16:15:39 +01:00
Marius Bakke 7d1986c49f
gnu: gengetopt: Disable parallel tests.
* gnu/packages/popt.scm (gengetopt)[arguments]: Add #:parallel-tests? #f.
2018-02-01 14:44:01 +01:00
Marius Bakke f8460d26ab
Revert "Revert "gnu: python-dateutil: Update to 2.6.1.""
This reverts commit f021f32ae3.
2018-02-01 13:19:53 +01:00
Tobias Geerinckx-Rice 7eaa37a19d
gnu: sslh: Update to 1.19b.
* gnu/packages/networking.scm (sslh): Update to 1.19b.
[inputs]: Add pcre.
[home-page]: Update and use HTTPS.
2018-02-01 13:19:06 +01:00
Marius Bakke 1bab734085
gnu: strongswan: Adjust to renamed tzdata input.
* gnu/packages/networking.scm (strongswan)[native-inputs]: Replace
TZDATA-2017A with TZDATA-FOR-TESTS.
2018-02-01 13:19:02 +01:00
Marius Bakke bee7bb315c
Merge branch 'master' into core-updates 2018-02-01 13:18:47 +01:00