ccheung [Wed, 27 Jun 2018 14:46:15 -0700] rev 50851
8203664: JFR start failure after AppCDS archive created with JFR StartFlightRecording
Summary: disable JFR and output a warning message during CDS dump time if JFR is enabled.
Reviewed-by: jiangli, lfoltan
jjg [Wed, 27 Jun 2018 14:20:41 -0700] rev 50850
8205438: Re-enable shebang tests in test/jdk/tools/launchers/SourceMode.java
Reviewed-by: mchung
iignatyev [Wed, 27 Jun 2018 13:43:52 -0700] rev 50849
8199265: java/util/Arrays/TimSortStackSize2.java fails with OOM
Reviewed-by: dholmes
dfuchs [Wed, 27 Jun 2018 21:18:33 +0100] rev 50848
8205945: Revert unintended changes to make/gensrc/Gensrc-jdk.hotspot.agent.gmk
Reviewed-by: jjg, erikj
glaubitz [Wed, 27 Jun 2018 21:56:11 +0200] rev 50847
8205616: Build fails with system headers after 8204572
Reviewed-by: erikj
Contributed-by: Magnuse Ihse Bursie <magnus.ihse.bursie@oracle.com>, Fridrich Strba <fridrich.strba@suse.com>
dfuchs [Wed, 27 Jun 2018 20:19:59 +0100] rev 50846
8205397: InetAddress has wrong declaration for readObjectNoData
Reviewed-by: alanb, rriggs
pliden [Wed, 27 Jun 2018 19:45:06 +0200] rev 50845
8205678: ZGC: Remove unused ZAllocationFlags::java_thread()
Reviewed-by: stefank, eosterlund
pliden [Wed, 27 Jun 2018 19:45:05 +0200] rev 50844
8205676: ZGC: Remove TLAB allocations in relocation path
Reviewed-by: stefank, eosterlund
prr [Wed, 27 Jun 2018 10:06:03 -0700] rev 50843
Merge
serb [Mon, 25 Jun 2018 17:34:55 -0700] rev 50842
4475138: getBestCursorSize and XFree86 4.1.0
Reviewed-by: serb
Contributed-by: takiguc@linux.vnet.ibm.com
prr [Mon, 25 Jun 2018 14:56:07 -0700] rev 50841
Merge
srl [Mon, 25 Jun 2018 11:40:46 -0700] rev 50840
8187100: Support Unicode Variation Selectors
Summary: Support Unicode Variation Selectors
Reviewed-by: prr, srl
Contributed-by: Toshio Nakamura <toshiona@jp.ibm.com>
prr [Mon, 25 Jun 2018 10:21:50 -0700] rev 50839
Merge
sveerabhadra [Mon, 25 Jun 2018 14:32:46 +0530] rev 50838
8153732: Windows remote printer changes do not reflect in lookupPrintServices()
Reviewed-by: prr, psadhukhan
pbansal [Mon, 25 Jun 2018 12:50:25 +0530] rev 50837
8194873: right ALT key hotkeys no longer work in Swing components
Reviewed-by: serb, psadhukhan
pkbalakr [Mon, 25 Jun 2018 16:01:01 +0530] rev 50836
8202696: Remove exclusion range for phonetic chars in windows fontconfig.properties
Reviewed-by: prr, naoto
Contributed-by: dipak.kumar@oracle.com
serb [Sun, 24 Jun 2018 19:45:15 -0700] rev 50835
8205324: Part of java.awt.Desktop.browse(URI) spec is outdated after support of applets was removed
Reviewed-by: prr
serb [Sun, 24 Jun 2018 16:35:21 -0700] rev 50834
8205153: Delete "standard instructions" machinery in the open automated tests
Reviewed-by: prr
serb [Sat, 23 Jun 2018 11:48:42 -0700] rev 50833
8205144: JSpinner may change the font after became visible
Reviewed-by: psadhukhan
serb [Fri, 22 Jun 2018 19:19:43 -0700] rev 50832
8205456: Unification of iterations over arrays
Reviewed-by: prr
prr [Fri, 22 Jun 2018 13:21:23 -0700] rev 50831
8205494: Convert or remove all AWT applet demos
Reviewed-by: serb, erikj
prr [Fri, 22 Jun 2018 12:16:14 -0700] rev 50830
8205136: Move StylePad demo to the open repository
Reviewed-by: serb, erikj
sveerabhadra [Fri, 22 Jun 2018 10:29:14 +0530] rev 50829
8204946: Clean-up problem list for JDK-8202933 and JDK-8202934
Reviewed-by: prr
prr [Thu, 21 Jun 2018 16:58:09 -0700] rev 50828
8205498: Typo in fix for 8205119 breaks Solaris demo build
Reviewed-by: serb
prr [Thu, 21 Jun 2018 14:32:41 -0700] rev 50827
8205119: SwingApplet demo should be removed
Reviewed-by: serb
prr [Thu, 21 Jun 2018 12:54:30 -0700] rev 50826
8205441: Upgrade to harfbuzz 1.8.1
Reviewed-by: serb
prr [Thu, 21 Jun 2018 09:53:50 -0700] rev 50825
Merge
serb [Wed, 20 Jun 2018 11:12:48 -0700] rev 50824
8203003: Several FileDialog Modality Tests fail on Linux due to X errors
Reviewed-by: prr, psadhukhan
iveresov [Wed, 27 Jun 2018 09:56:06 -0700] rev 50823
8202698: Update Graal for JEP 181 - Nest-based access control
Reviewed-by: kvn
neliasso [Wed, 27 Jun 2018 18:46:30 +0200] rev 50822
8204157: Compiler.sunflow hangs after JDK-8192992
Summary: Treat non-loop phis as stores
Reviewed-by: thartmann
sherman [Wed, 27 Jun 2018 09:45:18 -0700] rev 50821
8200243: System error message is decoded as invalid encoding in Windows.
Reviewed-by: alanb
joehw [Wed, 27 Jun 2018 09:31:51 -0700] rev 50820
8205058: (fs) Files read/writeString should throw CharacterCodingException instead of IOException with an IllegalArgumentException as cause
Reviewed-by: sherman, alanb, lancea
jiangli [Wed, 27 Jun 2018 11:55:35 -0400] rev 50819
8205699: assert(_owner_offset != 0) failed in javaClasses.cpp
Summary: Added java_util_concurrent_locks_AbstractOwnableSynchronizer::serialize.
Reviewed-by: ccheung, dholmes
jgeorge [Wed, 27 Jun 2018 20:04:31 +0530] rev 50818
8189429: SA: MacOSX: Replace the deprecated PT_ATTACH with PT_ATTACHEXC
Summary: Avoid the waitpid() and receive, handle and reply to the incoming Mach exception message obtained with PT_ATTACHEXC.
Reviewed-by: sballal, erikj, gziemski, rwestberg, dholmes, dcubed, poonam, dsamersoff
rriggs [Wed, 27 Jun 2018 09:36:34 -0400] rev 50817
8066709: Make some JDK system properties read only
Reviewed-by: lancea, sundar, bchristi, weijun, mchung, alanb, mullan
goetz [Wed, 27 Jun 2018 09:52:23 +0200] rev 50816
8199940: Print more information about class loaders in IllegalAccessErrors.
Reviewed-by: lfoltan, mchung
rehn [Wed, 27 Jun 2018 12:46:15 +0200] rev 50815
8205583: Crash in ConcurrentHashTable do_bulk_delete_locked_for
Reviewed-by: coleenp, gziemski
mdoerr [Wed, 27 Jun 2018 11:54:15 +0200] rev 50814
8205609: [PPC64] Fix PPC64 part of 8010319 and TLH without UseSIGTRAP on AIX
Reviewed-by: dholmes, goetz
ssahoo [Wed, 27 Jun 2018 02:20:55 -0700] rev 50813
8205111: Develop new Test to verify different key types for supported TLS protocols.
Summary: TLS test with different key types for supported.
Reviewed-by: xuelei
pliden [Wed, 27 Jun 2018 11:05:07 +0200] rev 50812
8205663: ZGC: Log metaspace used/capacity/committed/reserved
Reviewed-by: stefank, ehelin
pliden [Wed, 27 Jun 2018 11:05:01 +0200] rev 50811
8205664: Move detailed metaspace logging from debug to trace
Reviewed-by: stuefe, stefank
pmuthuswamy [Wed, 27 Jun 2018 12:56:21 +0530] rev 50810
8187288: bad (no) wrapping for modifier and type column
Reviewed-by: jjg
smarks [Tue, 26 Jun 2018 19:45:59 -0700] rev 50809
8203670: unmodifiable List iterator() implementations should not be ListIterators
Reviewed-by: redestad, igerasim, plevart
amlu [Wed, 27 Jun 2018 09:44:46 +0800] rev 50808
8205673: Problem list RmiRegistrySslTest.java and RmiSslBootstrapTest.sh
Reviewed-by: xuelei
erikj [Tue, 26 Jun 2018 17:41:42 -0700] rev 50807
8205625: linux-aarch64-cmp-baseline fails builds-tier5
Reviewed-by: dholmes
iignatyev [Tue, 26 Jun 2018 16:01:37 -0700] rev 50806
8199580: [TESTBUG] Un-quarantine vm/mlvm/indy/func/jdi/breakpointOtherStratum and breakpoint
Reviewed-by: kvn
sspitsyn [Tue, 26 Jun 2018 15:46:20 -0700] rev 50805
8205723: Problem list serviceability/jvmti/HeapMonitor/MyPackage/HeapMonitorStatRateTest.java
Summary: Add the test to the ProblemList.txt
Reviewed-by: dcubed, cjplummer
dnsimon [Wed, 27 Jun 2018 00:16:37 +0200] rev 50804
8205703: [JVMCI] Expose all GC selection flags
Reviewed-by: kvn, dlong
kbarrett [Tue, 26 Jun 2018 16:59:38 -0400] rev 50803
8205559: Remove IN_CONCURRENT_ROOT Access decorator
Summary: Removed decorator and made all NativeAccess use barriers.
Reviewed-by: pliden, stefank
sspitsyn [Tue, 26 Jun 2018 13:50:59 -0700] rev 50802
8205721: Problem list serviceability/jvmti/HeapMonitor/MyPackage/HeapMonitorStatArrayCorrectnessTest.java
Summary: Add the test to the ProblemList.txt
Reviewed-by: dcubed
stefank [Tue, 26 Jun 2018 13:55:17 +0200] rev 50801
8144992: Remove OopIterateClosure::idempotent
Reviewed-by: pliden, kbarrett
stefank [Tue, 26 Jun 2018 13:54:19 +0200] rev 50800
8205607: Use oop_iterate instead of oop_iterate_no_header
Reviewed-by: pliden, kbarrett
sspitsyn [Tue, 26 Jun 2018 12:29:20 -0700] rev 50799
8205701: Problem list serviceability/jvmti/HeapMonitor/MyPackage/HeapMonitorGCCMSTest.java
Summary: Add the test to the ProblemList.txt
Reviewed-by: dcubed
dcubed [Tue, 26 Jun 2018 14:15:49 -0400] rev 50798
8205648: fix for 8205195 breaks secondary error handling
Summary: Only grab Threads_lock in VMError::controlled_crash() when we don't already own it.
Reviewed-by: sspitsyn, stuefe
jlaskey [Tue, 26 Jun 2018 14:14:29 -0300] rev 50797
8205696: Undo licence.md
Reviewed-by: sundar, hannesw
rriggs [Tue, 26 Jun 2018 12:42:36 -0400] rev 50796
8205547: FileChannel/CleanerTest.java fails due to expected FD count
Reviewed-by: psandoz
neliasso [Fri, 15 Jun 2018 14:46:04 +0200] rev 50795
8205107: assert(c->Opcode() == Op_SafePoint) failed: broken outer loop
Summary: Don't remove safepoint belonging to OuterStripMinedLoopEndNode
Reviewed-by: kvn
bpb [Tue, 26 Jun 2018 09:33:55 -0700] rev 50794
8205641: Make java/nio/channels/Selector/RacyDeregister.java noisier and flush after prints
Reviewed-by: alanb
kvn [Tue, 26 Jun 2018 09:14:49 -0700] rev 50793
8205400: [Graal] compiler/jvmci/compilerToVM/DisassembleCodeBlobTest.java fails with can't be enqueued for compilation on level 4
Summary: add -XX:-BackgroundCompilation to tests to eager initialize JVMCI
Reviewed-by: thartmann
apetcher [Tue, 26 Jun 2018 11:14:27 -0400] rev 50792
8203228: Branch-free output conversion for X25519 and X448
Summary: Make some field arithmetic operations for X25519/X448 more resilient against side-channel attacks
Reviewed-by: ascarpino
goetz [Mon, 25 Jun 2018 23:04:21 +0200] rev 50791
8205419: [testbug] TestJmapCore failing without SA: introduce @requires vm.hasSAandCanAttach
Reviewed-by: jgeorge, cjplummer
hseigel [Tue, 26 Jun 2018 09:52:21 -0400] rev 50790
8205422: assert(false) failed: Bad verification_type_info
Summary: Instead of asserting, print out the bad value
Reviewed-by: lfoltan, coleenp
chegar [Tue, 26 Jun 2018 13:16:40 +0100] rev 50789
8205671: Remove HTTP Client tests erroneously problem listed by the TLS 1.3 integration
Reviewed-by: dfuchs, michaelm
weijun [Tue, 26 Jun 2018 18:55:48 +0800] rev 50788
8201815: Use Mozilla Public Suffix List
Reviewed-by: michaelm, erikj, ihse
tschatzl [Tue, 26 Jun 2018 11:09:42 +0200] rev 50787
8204082: Make names of Young GCs more uniform in logs
Summary: All G1 young gcs now start with "Pause Young" plus a more detailed description
Reviewed-by: sjohanss
mbaesken [Tue, 26 Jun 2018 09:17:53 +0200] rev 50786
8205342: windows : potential memleaks in getAdapter(s) in NetworkInterface_winXP.c
Reviewed-by: alanb, igerasim, stuefe
ghaug [Mon, 25 Jun 2018 16:00:56 +0200] rev 50785
8200720: Print additional information in thread dump (times, allocated bytes etc.)
Reviewed-by: dholmes, clanger, cjplummer, sspitsyn
alanb [Tue, 26 Jun 2018 08:13:02 +0100] rev 50784
8205612: (fc) Files.readAllBytes fails with ClosedByInterruptException when interrupt status set
Reviewed-by: bpb
mchung [Mon, 25 Jun 2018 22:28:04 -0700] rev 50783
8205623: Replace use of Class::getPackage with Class::getPackageName
Reviewed-by: jjg, erikj
mchung [Mon, 25 Jun 2018 22:27:09 -0700] rev 50782
8205627: Replace hardcoded spec version value in build.tools.ExtLink taglet
Reviewed-by: jjg, erikj
martin [Mon, 25 Jun 2018 20:58:01 -0700] rev 50781
8205649: Make clang stack flags independent of OS
Reviewed-by: erikj
xiaofeya [Mon, 25 Jun 2018 20:08:05 -0700] rev 50780
8194152: sun/security/tools/jarsigner/AltProvider.java failed on de-DE locale
Reviewed-by: naoto
Contributed-by: dan.z.zhou@oracle.com
xiaofeya [Mon, 25 Jun 2018 20:03:46 -0700] rev 50779
8196213: sun/security/tools/jarsigner/warnings/NoTimestampTest.java test fails on ar_SA locale.
Reviewed-by: naoto
Contributed-by: dan.z.zhou@oracle.com
weijun [Tue, 26 Jun 2018 10:43:50 +0800] rev 50778
8202299: Java Keystore fails to load PKCS12/PFX certificates created in WindowsServer2016
Reviewed-by: mullan, xuelei
weijun [Tue, 26 Jun 2018 10:43:43 +0800] rev 50777
8202608: CommonSeeder test needs a white-box testing mechanism to replace the default entropy source
Reviewed-by: xuelei
smarks [Mon, 25 Jun 2018 18:49:30 -0700] rev 50776
8205455: jdeprscan issues annotation processor warning regarding RELEASE_10
Reviewed-by: jjg
martin [Mon, 25 Jun 2018 18:01:42 -0700] rev 50775
8205184: Delegating Iterator implementations that don't delegate forEachRemaining()
Reviewed-by: psandoz
Contributed-by: Tobias Thierer <tobiast@google.com>, Martin Buchholz <martinrb@google.com>
smarks [Mon, 25 Jun 2018 17:11:27 -0700] rev 50774
8201610: Broken link on the page api/java.rmi/java/rmi/server/UnicastRemoteObject.html
Reviewed-by: psandoz, lancea
mbalao [Tue, 26 Jun 2018 08:10:45 +0800] rev 50773
8195607: sun/security/pkcs11/Secmod/TestNssDbSqlite.java failed with "NSS initialization failed" on NSS 3.34.1
Reviewed-by: valeriep, weijun
stefank [Mon, 25 Jun 2018 22:25:29 +0200] rev 50772
8205632: Include stack.inline.hpp in markSweep.inline.hpp
Reviewed-by: kbarrett
psandoz [Mon, 25 Jun 2018 14:39:44 -0700] rev 50771
8195650: Method references to VarHandle accessors
Reviewed-by: jrose
bpb [Mon, 25 Jun 2018 14:36:16 -0700] rev 50770
8204930: Reader:nullReader() spec does not match the behavior
Reviewed-by: bpb, rriggs
Contributed-by: Patrick Reinhart <patrick@reini.net>
goetz [Mon, 25 Jun 2018 13:37:01 +0200] rev 50769
8205605: [testbug][aix] Various test adaption to aix pecularities.
Reviewed-by: lfoltan, coleenp
xuelei [Mon, 25 Jun 2018 13:41:39 -0700] rev 50768
8196584: TLS 1.3 Implementation
Reviewed-by: ascarpino, coffeys, dfuchs, jjiang, jnimeh, mullan, rhalade, ssahoo, valeriep, weijun, wetmore, xuelei
Contributed-by: Adam Petcher <adam.petcher@oracle.com>, Amanda Jiang <amanda.jiang@oracle.com>, Anthony Scarpino <anthony.scarpino@oracle.com>, Bradford Wetmore <bradford.wetmore@oracle.com>, Jamil Nimeh <jamil.j.nimeh@oracle.com>, John Jiang <sha.jiang@oracle.com>, Rajan Halade <rajan.halade@oracle.com>, Sibabrata Sahoo <sibabrata.sahoo@oracle.com>, Valerie Peng <valerie.peng@oracle.com>, Weijun Wang <weijun.wang@oracle.com>, Xuelei Fan <xuelei.fan@oracle.com>
dpochepk [Mon, 25 Jun 2018 21:22:16 +0300] rev 50767
8205475: AARCH64: optimize FPU loads and stores in C1_Runtime1_aarch64.cpp
Reviewed-by: aph, adinn
hseigel [Mon, 25 Jun 2018 14:10:44 -0400] rev 50766
8205614: NestMates tests failing in CI jdk11-jdk.931
Summary: Fixed the wording to agree with new IAE message text
Reviewed-by: lfoltan, dcubed, mchung
coleenp [Mon, 25 Jun 2018 13:47:27 -0400] rev 50765
8202615: Remove NativeMonitorSpinLimit, NativeMonitorFlags and NativeMonitorTimeout experimental flags
Summary: Removed NativeMonitorSpinLimit, NativeMonitorFlags and NativeMonitorTimeout experimental flags from globals.hpp and mutex.cpp and marked them as obsolete.
Reviewed-by: kbarrett, dholmes
Contributed-by: patricio.chilano.mateo@oracle.com
dl [Mon, 25 Jun 2018 09:59:16 -0700] rev 50764
8203681: Miscellaneous changes imported from jsr166 CVS 2018-06
Reviewed-by: martin, psandoz
dl [Mon, 25 Jun 2018 09:59:16 -0700] rev 50763
8203864: Execution error in Java's Timsort
Reviewed-by: martin, psandoz, forax
dl [Mon, 25 Jun 2018 09:59:16 -0700] rev 50762
8202422: value of 'sizeCtl' in ConcurrentHashMap varies with the constructor called
Reviewed-by: martin, psandoz
lfoltan [Mon, 25 Jun 2018 11:33:11 -0400] rev 50761
8169559: Add class loader names to relevant VM messages
Summary: Added new method class_in_module_of_loader to provide a standard format for class information within error messages.
Reviewed-by: goetz, hseigel, mchung
hb [Mon, 25 Jun 2018 20:36:06 +0530] rev 50760
8204661: Show error 'Port already in use' in HashedPasswordFileTest.java
Reviewed-by: mchung, dholmes, dcubed, dfuchs
lfoltan [Mon, 25 Jun 2018 10:34:46 -0400] rev 50759
8205509: assert(_name_and_id != 0LL) failed: encountered a class loader null name and id
Summary: The method loader_name_and_id should return the external name of the class loader if _name_and_id is null.
Reviewed-by: coleenp, stuefe
dpochepk [Mon, 25 Jun 2018 16:32:23 +0300] rev 50758
8189113: AARCH64: StringLatin1 inflate intrinsic doesn't use prefetch instruction
Reviewed-by: aph
dpochepk [Mon, 25 Jun 2018 16:32:02 +0300] rev 50757
8189103: AARCH64: optimize String indexOf intrinsic
Reviewed-by: aph
dpochepk [Mon, 25 Jun 2018 16:31:37 +0300] rev 50756
8202326: AARCH64: optimize string compare intrinsic
Reviewed-by: dsamersoff
dpochepk [Mon, 25 Jun 2018 16:31:18 +0300] rev 50755
8204289: AARCH64: enable math intrinsics usage in interpreter and C1
Reviewed-by: aph, dsamersoff
dpochepk [Mon, 25 Jun 2018 16:30:49 +0300] rev 50754
8189105: AARCH64: create intrinsic for sin and cos
Reviewed-by: aph, adinn
dpochepk [Mon, 25 Jun 2018 16:30:16 +0300] rev 50753
8196402: AARCH64: create intrinsic for Math.log
Reviewed-by: aph, dsamersoff
stefank [Sat, 26 May 2018 06:59:49 +0200] rev 50752
8204540: Automatic oop closure devirtualization
Reviewed-by: kbarrett, eosterlund
jlahoda [Mon, 25 Jun 2018 12:44:52 +0200] rev 50751
8203814: javac --release=8 \"cannot find symbol\" for NashornException.getEcmaError()
Summary: Updating ct.sym data for jdk.scripting.nashorn to JDK8u102 version of the API.
Reviewed-by: hannesw
pkoppula [Tue, 20 Mar 2018 11:16:10 +0530] rev 50750
8187218: GSSCredential.getRemainingLifetime() returns negative value for TTL > 24 days.
Reviewed-by: mullan
Contributed-by: prasadarao.koppula@oracle.com, weijun.wang@oracle.com
pliden [Mon, 25 Jun 2018 10:54:55 +0200] rev 50749
8205405: ZGC: Decouple JFR type registration
Reviewed-by: stefank, mgronlun
mhorie [Mon, 25 Jun 2018 10:41:03 +0200] rev 50748
8204524: Unnecessary memory barriers in G1ParScanThreadState::copy_to_survivor_space
Reviewed-by: kbarrett, mdoerr, drwhite, tschatzl
rgoel [Mon, 25 Jun 2018 11:51:04 +0530] rev 50747
8205158: Update the .md files for 3rd party software Unicode 10.0, ICU 60.2, and CLDR v33.
Summary: updated legal files for CLDR, ICU and Unicode.
Reviewed-by: naoto, mchung
never [Sun, 24 Jun 2018 21:46:11 -0700] rev 50746
8198909: [Graal] compiler/codecache/stress/UnexpectedDeoptimizationTest.java crashed with SIGSEGV
Reviewed-by: eosterlund, iveresov
egahlin [Mon, 25 Jun 2018 02:07:42 +0200] rev 50745
8203929: Limit amount of data for JFR.dump
Reviewed-by: mgronlun
alanb [Sun, 24 Jun 2018 16:25:47 +0100] rev 50744
8205533: Class.getPackage() fails with InternalError if class is defined to the bootstrap class loader but module is not in the boot layer
Reviewed-by: mchung
dsamersoff [Sun, 24 Jun 2018 15:02:08 +0300] rev 50743
8203481: Incorrect constraint for unextended_sp in frame:safe_for_sender
Summary: Relaxed assert inside safe_for_sender
Reviewed-by: aph, dpochepk
plevart [Sun, 24 Jun 2018 10:41:51 +0200] rev 50742
8205540: test/hotspot/jtreg/vmTestbase/nsk/jdb/trace/trace001/trace001.java fails with Debuggee did not exit after 15 <cont> commands
Summary: screen usage/initialization of TerminatingThreadLocal with a non-null check on Thread.threadLocals field
Reviewed-by: dholmes, alanb
jmanson [Sat, 23 Jun 2018 22:49:48 -0700] rev 50741
8205570: fix a number of typos in the JVMTI spec
Summary: fix typos in the JVMTI spec
Reviewed-by: dholmes, sspitsyn
alanb [Sat, 23 Jun 2018 09:46:18 +0100] rev 50740
Merge