Marius Bakke 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ff43d95807 
								
							 
						 
						
							
							
								
								gnu: python-joblib: Update to 0.13.0.  
							
							... 
							
							
							
							* gnu/packages/python.scm (python-joblib): Update to 0.13.0.
[source](snippet): Remove.
[arguments]: Remove 'disable-failing-tests' phase.  Add custom check phase.
[native-inputs]: Remove PYTHON-NOSE, PYTHON-SPHINX, PYTHON-DOCUTILS and
PYTHON-NUMPYDOC.  Add PYTHON-PYTEST. 
							
						 
						
							2018-11-20 00:57:49 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marius Bakke 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								89d88b8530 
								
							 
						 
						
							
							
								
								gnu: python-natsort: Update to 5.4.1.  
							
							... 
							
							
							
							* gnu/packages/python.scm (python-natsort): Update to 5.4.1.
[arguments]: Add #:modules.  Replace 'check' phase with custom pytest
invokation.
[native-inputs]: Remove PYTHON-PYTEST-CACHE, PYTHON-PYTEST-FLAKES and
PYTHON-PYTEST-PEP8.  Add PYTHON-PYTEST and PYTHON-PYTEST-MOCK.
(python2-natsort)[native-inputs]: Remove PYTHON2-ENUM34 and PYTHON2-MOCK. 
							
						 
						
							2018-11-20 00:57:48 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jovany Leandro G.C 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f4ee41c960 
								
							 
						 
						
							
							
								
								gnu: python-kivy: Update to 1.10.1  
							
							... 
							
							
							
							* gnu/packages/python.scm (python-kivy): Update to 1.10.1.
Signed-off-by: Ludovic Courtès <ludo@gnu.org> 
							
						 
						
							2018-11-19 09:59:08 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eric Bavier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5b01b6034a 
								
							 
						 
						
							
							
								
								python: Honor '--cores=...' in tests.  
							
							... 
							
							
							
							* gnu/packages/python.scm (python-2.7)[arguments]: Add #:make-flags. 
							
						 
						
							2018-11-17 00:43:30 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marius Bakke 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								79ee97a144 
								
							 
						 
						
							
							
								
								Merge branch 'master' into core-updates  
							
							
							
						 
						
							2018-11-14 21:20:46 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Clément Lassieur 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4ad3786b7b 
								
							 
						 
						
							
							
								
								gnu: Add python-precis-i18n.  
							
							... 
							
							
							
							* gnu/packages/messaging.scm (python-precis-i18n): New variable. 
							
						 
						
							2018-11-11 15:58:50 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Efraim Flashner 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2bdca67351 
								
							 
						 
						
							
							
								
								gnu: python-yapf: Update to 0.24.0.  
							
							... 
							
							
							
							* gnu/packages/python.scm (python-yapf): Update to 0.24.0. 
							
						 
						
							2018-11-11 11:54:32 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Efraim Flashner 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								261e421459 
								
							 
						 
						
							
							
								
								gnu: python-pyclipper: Enable tests.  
							
							... 
							
							
							
							* gnu/packages/python.scm (python-pyclipper)[arguments]: Enable tests.
[native-inputs]: Add python-pytest, python-pytest-runner,
python-unittest2. 
							
						 
						
							2018-11-11 11:13:56 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Efraim Flashner 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8189ce6f05 
								
							 
						 
						
							
							
								
								gnu: python-pyclipper: Update to 1.1.0post1.  
							
							... 
							
							
							
							* gnu/packages/python.scm (python-pyclipper): Update to 1.1.0post1.
[source]: Add snippet to remove cythonized source files.
[arguments]: Add custom phase to generate cythonized files.
[native-inputs]: Add python-cython.
[description]: Update clipper library version. 
							
						 
						
							2018-11-11 11:13:56 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Efraim Flashner 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5ac2b2717f 
								
							 
						 
						
							
							
								
								gnu: python-networkx2: Remove variable.  
							
							... 
							
							
							
							* gnu/packages/python.scm (python-networkx2): Remove variable.
* gnu/packages/patches/python-networkx2-reproducible-build.patch: Remove
file.
* gnu/local.mk (dist_patch_DATA): Remove it. 
							
						 
						
							2018-11-11 11:13:55 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marius Bakke 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								64461ba20a 
								
							 
						 
						
							
							
								
								Merge branch 'master' into core-updates  
							
							
							
						 
						
							2018-11-09 17:02:08 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Luther Thompson 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9870b9f7f8 
								
							 
						 
						
							
							
								
								gnu: python-ilinkedlist: Update to 0.3.1.  
							
							... 
							
							
							
							* gnu/packages/python.scm (python-ilinkedlist): Update to 0.3.1.
Signed-off-by: Ludovic Courtès <ludo@gnu.org> 
							
						 
						
							2018-11-08 10:24:26 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Vagrant Cascadian 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								195e081b43 
								
							 
						 
						
							
							
								
								gnu: Add python-pyelftools.  
							
							... 
							
							
							
							* gnu/packages/python.scm (python-pyelftools):
  New public variable.
Signed-off-by: Ludovic Courtès <ludo@gnu.org> 
							
						 
						
							2018-11-08 10:24:22 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marius Bakke 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f4a5faa9dc 
								
							 
						 
						
							
							
								
								Merge branch 'master' into core-updates  
							
							
							
						 
						
							2018-11-05 23:56:22 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Luther Thompson 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1417f50317 
								
							 
						 
						
							
							
								
								gnu: python-ilinkedlist: Update to 0.2.0.  
							
							... 
							
							
							
							* gnu/packages/python.scm (python-ilinkedlist): Update to 0.2.0.
Signed-off-by: Ludovic Courtès <ludo@gnu.org> 
							
						 
						
							2018-11-05 00:08:47 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Vagrant Cascadian 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b6e9514864 
								
							 
						 
						
							
							
								
								gnu: pelican: Update to 3.7.1.  
							
							... 
							
							
							
							* gnu/packages/python.scm (pelican): Update to 3.7.1.
  [home-page]: Use HTTPS URL.
Signed-off-by: Ludovic Courtès <ludo@gnu.org> 
							
						 
						
							2018-11-05 00:08:47 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Julien Lepiller 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ff349415b2 
								
							 
						 
						
							
							
								
								gnu: python-apache-libcloud: Update to 2.3.0.  
							
							... 
							
							
							
							* gnu/packages/python.scm (python-apache-libcloud)
(python2-apache-libcloud): Update to 2.3.0. 
							
						 
						
							2018-11-02 14:32:24 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Tobias Geerinckx-Rice 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a72d337fbc 
								
							 
						 
						
							
							
								
								gnu: python-jsonrpclib-pelix: Update to 0.3.2.  
							
							... 
							
							
							
							* gnu/packages/python.scm (python-jsonrpclib-pelix): Update to 0.3.2.
[arguments]: Disable #:tests?. 
							
						 
						
							2018-11-01 04:34:25 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Tobias Geerinckx-Rice 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1204402a90 
								
							 
						 
						
							
							
								
								gnu: python-partd: Update to 0.3.9.  
							
							... 
							
							
							
							* gnu/packages/python.scm (python-partd): Update to 0.3.9. 
							
						 
						
							2018-10-30 23:40:42 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Tobias Geerinckx-Rice 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								11d99192c7 
								
							 
						 
						
							
							
								
								gnu: Add python-reparser.  
							
							... 
							
							
							
							* gnu/packages/python.scm (python-reparser, python2-reparser):
New public variable. 
							
						 
						
							2018-10-24 21:34:21 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Tobias Geerinckx-Rice 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d4eb8a21a6 
								
							 
						 
						
							
							
								
								gnu: Add python-readlike.  
							
							... 
							
							
							
							* gnu/packages/python.scm (python-readlike, python2-readlike):
New public variables. 
							
						 
						
							2018-10-24 21:34:21 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marius Bakke 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								545da9fd5f 
								
							 
						 
						
							
							
								
								gnu: python-flake8: Update to 3.6.0.  
							
							... 
							
							
							
							* gnu/packages/check.scm (python-hypothesis)[native-inputs]: Change
PYTHON-FLAKE8 to PYTHON-FLAKE8-3.5.
* gnu/packages/python.scm (python-flake8, python2-flake8): Rename to ...
(python-flake8-3.5, python2-flake8-3.5): ... this.
(python-flake8, python2-flake8): New public variables. 
							
						 
						
							2018-10-24 16:34:23 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marius Bakke 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0c8e255549 
								
							 
						 
						
							
							
								
								gnu: python-attrs: Update to 18.2.0.  
							
							... 
							
							
							
							* gnu/packages/python.scm (python-attrs): Update to 18.2.0.
[arguments]: New field.
[native-inputs]: Add PYTHON-PYMPLER.
(python-attrs-bootstrap): Stay on version 17.4.0. 
							
						 
						
							2018-10-23 17:11:03 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marius Bakke 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5176795d22 
								
							 
						 
						
							
							
								
								gnu: Add python-pympler.  
							
							... 
							
							
							
							* gnu/packages/python.scm (python-pympler, python2-pympler): New public variables. 
							
						 
						
							2018-10-23 17:11:03 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marius Bakke 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4cdbffdc2f 
								
							 
						 
						
							
							
								
								gnu: python-stem: Update to 1.7.0.  
							
							... 
							
							
							
							* gnu/packages/python.scm (python-stem): Update to 1.7.0.
[arguments]: Remove obsolete phase.
[native-inputs]: Change PYTHON-PEP8 to PYTHON-PYCODESTYLE. 
							
						 
						
							2018-10-23 00:35:05 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marius Bakke 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3a23036a0a 
								
							 
						 
						
							
							
								
								gnu: python-datrie: Fix FTBFS with Python 3.7.  
							
							... 
							
							
							
							* gnu/packages/python.scm (python-datrie)[arguments]: Add phase 'cythonize'. 
							
						 
						
							2018-10-22 23:08:14 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marius Bakke 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c166a88dea 
								
							 
						 
						
							
							
								
								Merge branch 'master' into core-updates  
							
							
							
						 
						
							2018-10-22 23:07:16 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marius Bakke 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								63abd1e2a3 
								
							 
						 
						
							
							
								
								gnu: python-pymongo: Update to 3.7.2.  
							
							... 
							
							
							
							* gnu/packages/python.scm (python-pymongo): Update to 3.7.2. 
							
						 
						
							2018-10-22 23:01:19 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marius Bakke 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								47d7c10387 
								
							 
						 
						
							
							
								
								gnu: python-sure: Update to 1.4.11.  
							
							... 
							
							
							
							* gnu/packages/python.scm (python-sure): Update to 1.4.11. 
							
						 
						
							2018-10-22 23:01:19 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marius Bakke 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9b9aaa57e3 
								
							 
						 
						
							
							
								
								gnu: python-markdown: Update to 3.0.1.  
							
							... 
							
							
							
							* gnu/packages/python.scm (python-markdown): Update to 3.0.1.
[arguments]: Remove. 
							
						 
						
							2018-10-22 23:01:19 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marius Bakke 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1b50df7d5b 
								
							 
						 
						
							
							
								
								gnu: python-markdown: Update home page.  
							
							... 
							
							
							
							* gnu/packages/python.scm (python-markdown)[home-page]: Change to current. 
							
						 
						
							2018-10-22 23:01:19 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marius Bakke 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f232c875d2 
								
							 
						 
						
							
							
								
								gnu: python-lazy-object-proxy: Update to 1.3.1.  
							
							... 
							
							
							
							* gnu/packages/python.scm (python-lazy-object-proxy): Update to 1.3.1. 
							
						 
						
							2018-10-22 23:01:18 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marius Bakke 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b45688313b 
								
							 
						 
						
							
							
								
								gnu: python-mistune: Update to 0.8.4.  
							
							... 
							
							
							
							* gnu/packages/python.scm (python-mistune): Update to 0.8.4. 
							
						 
						
							2018-10-22 23:01:18 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Luther Thompson 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								16d212510a 
								
							 
						 
						
							
							
								
								gnu: Add python-ilinkedlist.  
							
							... 
							
							
							
							* gnu/packages/python.scm (python-ilinkedlist): New variable. 
							
						 
						
							2018-10-21 23:54:46 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marius Bakke 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ffddb42d6c 
								
							 
						 
						
							
							
								
								Merge branch 'master' into core-updates  
							
							
							
						 
						
							2018-10-21 18:06:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marius Bakke 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e381ae317c 
								
							 
						 
						
							
							
								
								gnu: python2-bz2file: Inherit arguments from python-bzfile.  
							
							... 
							
							
							
							* gnu/packages/python.scm (python-bz2file)[properties]: Remove field.
(python2-bz2file): Use PACKAGE-WITH-PYTHON2. 
							
						 
						
							2018-10-21 18:03:06 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Oleg Pykhalov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								227da3a4c5 
								
							 
						 
						
							
							
								
								gnu: python-glances: Update to 3.0.2.  
							
							... 
							
							
							
							* gnu/packages/python.scm (python-glances): Update to 3.0.2. 
							
						 
						
							2018-10-20 18:24:23 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Efraim Flashner 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1febc93f9b 
								
							 
						 
						
							
							
								
								Revert "gnu: python-fonttools: Update to 3.30.0."  
							
							... 
							
							
							
							This reverts commit 5fb543b3f7 
							
						 
						
							2018-10-18 21:25:36 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Efraim Flashner 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5fb543b3f7 
								
							 
						 
						
							
							
								
								gnu: python-fonttools: Update to 3.30.0.  
							
							... 
							
							
							
							* gnu/packages/python.scm (python-fonttools): Update to 3.30.0. 
							
						 
						
							2018-10-18 21:14:16 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marius Bakke 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								16f14f63db 
								
							 
						 
						
							
							
								
								gnu: Python: Adjust grafts for core-updates merge.  
							
							... 
							
							
							
							This adjust the grafts from a55ebe2e3a90aeaee861 
							
						 
						
							2018-10-17 20:53:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marius Bakke 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d02bb02f7d 
								
							 
						 
						
							
							
								
								Merge branch 'master' into core-updates  
							
							
							
						 
						
							2018-10-17 20:47:11 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marius Bakke 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a55ebe2e3a 
								
							 
						 
						
							
							
								
								gnu: python2: Add upstream security fixes.  
							
							... 
							
							
							
							This addresses CVE-2018-{1060,1061,14647,1000802}.
* gnu/packages/patches/python2-CVE-2018-1000802.patch,
gnu/packages/patches/python2-CVE-2018-1060.patch,
gnu/packages/patches/python2-CVE-2018-1061.patch,
gnu/packages/patches/python2-CVE-2018-14647.patch: New files.
* gnu/local.mk (dist_patch_DATA): Register it.
* gnu/packages/python.scm (python-2/fixed): New variable.
(python-2.7)[replacement]: New field.
(python2-minimal): Use PACKAGE/INHERIT. 
							
						 
						
							2018-10-17 20:34:37 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marius Bakke 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								90aeaee861 
								
							 
						 
						
							
							
								
								gnu: python: Fix CVE-2018-14647.  
							
							... 
							
							
							
							* gnu/packages/patches/python-CVE-2018-14647.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
* gnu/packages/python.scm (python-3/fixed): New variable.
(python-3.6)[replacement]: New field.
(python-minimal, python-debug, wrap-python3): Use PACKAGE/INHERIT instead of
standard inheritance. 
							
						 
						
							2018-10-17 20:34:37 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Efraim Flashner 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								fb3ff265cd 
								
							 
						 
						
							
							
								
								gnu: python-icalendar: Update to 4.0.3.  
							
							... 
							
							
							
							* gnu/packages/python.scm (python-icalendar): Update to 4.0.3. 
							
						 
						
							2018-10-17 11:40:08 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Cournoyer 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0731fc1ce7 
								
							 
						 
						
							
							
								
								gnu: python-mimeparse: Update to 1.6.0.  
							
							... 
							
							
							
							* gnu/packages/python.scm (python-mimeparse): Update to 1.6.0.
[phases]: Enable tests with a custom check phase. 
							
						 
						
							2018-10-14 22:02:40 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Leo Famulari 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d7814696b8 
								
							 
						 
						
							
							
								
								gnu: python-configargparse: Use pypi-uri.  
							
							... 
							
							
							
							* gnu/packages/python.scm (python-configargparse,
python2-configargparse)[source]: Use pypi-uri. 
							
						 
						
							2018-10-12 23:42:43 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Leo Famulari 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3c4d307e86 
								
							 
						 
						
							
							
								
								gnu: python-icalendar: Update to 4.0.2.  
							
							... 
							
							
							
							* gnu/packages/python.scm (python-icalendar: Update to 4.0.2. 
							
						 
						
							2018-10-12 23:42:43 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Efraim Flashner 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								fd15eb286e 
								
							 
						 
						
							
							
								
								gnu: python-more-itertools: Fix building on 32-bit architectures.  
							
							... 
							
							
							
							* gnu/packages/python.scm (python-more-itertools)[arguments]: Add a
custom phase to prevent overflowing on 32-bit architectures. 
							
						 
						
							2018-10-11 20:55:44 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ben Woodcroft 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								402561ccef 
								
							 
						 
						
							
							
								
								gnu: python2-backports-functools-lru-cache: Update to 1.5.  
							
							... 
							
							
							
							* gnu/packages/python.scm (python2-backports-functools-lru-cache): Update to 1.5. 
							
						 
						
							2018-10-08 16:37:03 +10:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marius Bakke 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								cf6db76d2a 
								
							 
						 
						
							
							
								
								Merge branch 'master' into core-updates  
							
							
							
						 
						
							2018-10-05 19:15:39 +02:00