comparing with ssh://hg.openjdk.java.net/shenandoah/jdk11
searching for changes
changeset:   51478:0961485fc686
parent:      51453:5bf28fee65c1
user:        kaddepalli
date:        Thu Jul 12 17:34:36 2018 +0530
summary:     8206238: Aspect ratio is not maintained when Image is scaled in JEditorPane

changeset:   51479:2e675859332a
user:        erikj
date:        Thu Jul 12 07:14:30 2018 -0700
summary:     8206903: Unable to build Client VM with JVMCI

changeset:   51480:d5d5f6658b12
user:        erikj
date:        Thu Jul 12 16:30:47 2018 +0200
summary:     8207001: *.obj.log files get truncated causing unreliable incremental builds on Windows

changeset:   51481:2f4c3cac8556
user:        goetz
date:        Wed Jul 11 16:11:10 2018 +0200
summary:     8206977: Minor improvements of runtime code.

changeset:   51482:040880bdd0d4
user:        psandoz
date:        Wed Jul 11 15:35:47 2018 -0700
summary:     8207027: Lookup.accessClass fails for an array type in the same package when assertions are enabled

changeset:   51483:6a037fd949e4
user:        naoto
date:        Thu Jul 12 11:24:10 2018 -0700
summary:     8207152: Placeholder for Japanese new era should be two characters

changeset:   51484:34696f3aa22b
user:        kvn
date:        Thu Jul 12 11:57:06 2018 -0700
summary:     8206953: compiler/profiling/TestTypeProfiling.java fails when JVMCI build disabled

changeset:   51485:bf686c47c109
user:        jcbeyler
date:        Thu Jul 12 12:00:52 2018 -0700
summary:     8206960: HeapMonitor tests fail with Graal

changeset:   51486:e6ee7cf448f0
user:        mikael
date:        Thu Jul 12 15:02:41 2018 -0700
summary:     8207210: Problem list javax/sound/sampled/Clip/AutoCloseTimeCheck.java

changeset:   51487:7c96d1e40280
user:        mikael
date:        Thu Jul 12 17:32:37 2018 -0700
summary:     8207217: Problem list java/lang/management/ThreadMXBean/AllThreadIds.java

changeset:   51488:9baa91bc7567
user:        xiaofeya
date:        Fri Jul 13 11:21:55 2018 +0800
summary:     8202481: RegisterDuringSelect.java fails with java.util.concurrent.ExecutionException: java.nio.channels.ClosedSelectorException

changeset:   51489:fc6cfe40e32a
user:        goetz
date:        Thu Jul 12 16:31:28 2018 +0200
summary:     8207049: Minor improvements of compiler code.

changeset:   51490:9e19d3a1a69d
user:        rraghavan
date:        Fri Jul 13 01:31:23 2018 -0700
summary:     8206873: 2 Null pointer dereference defect groups in LIRGenerator

changeset:   51491:6ec8d47cb021
user:        zyao
date:        Wed Jul 11 15:00:33 2018 +0800
summary:     8206975: AArch64: Fix CompareAndSwapOp when useLSE is enabled in Graal

changeset:   51492:7b4cc0cd6fe6
user:        simonis
date:        Wed Jul 11 19:23:27 2018 +0200
summary:     8207067: [test] prevent timeouts in serviceability/tmtools/jstat/{GcTest02,GcCauseTest02}.java

changeset:   51493:6a5c674b7413
user:        simonis
date:        Fri Jul 13 11:07:43 2018 +0200
summary:     8206998: [test] runtime/ElfDecoder/TestElfDirectRead.java requires longer timeout on ppc64

changeset:   51494:d2e182aa44c9
user:        bulasevich
date:        Fri Jul 13 07:01:51 2018 -0700
summary:     8207047: Multiple VM variants build fail

changeset:   51495:2282560a3d29
user:        xuelei
date:        Fri Jul 13 07:08:59 2018 -0700
summary:     8207029: Unable to use custom SSLEngine with default TrustManagerFactory after updating to JDK 11 b21

changeset:   51496:ad9d95f1a1f6
user:        roland
date:        Fri Jul 13 15:44:54 2018 +0200
summary:     8200282: Serializing non-zero byte as zero to ByteBuffer

changeset:   51497:57c152eb3198
user:        apetcher
date:        Fri Jul 13 10:42:30 2018 -0400
summary:     8206915: XDH TCK issues

changeset:   51498:73c769e0486a
user:        dtitov
date:        Thu Jul 12 22:53:35 2018 -0700
summary:     8191948: db error: InvalidTypeException: Can't assign double[][][] to double[][][]

changeset:   51499:c36ca9d88f54
user:        redestad
date:        Fri Jul 13 18:39:11 2018 +0200
summary:     8207235: ManagementFactory.getPlatformMXBeans(BufferPoolMXBean.class) throws NPE

changeset:   51500:4447720200f2
user:        rhalade
date:        Fri Jul 13 09:48:52 2018 -0700
summary:     8199779: Add T-Systems, GlobalSign and Starfield services root certificates

changeset:   51501:adc4d3fd4095
user:        kvn
date:        Fri Jul 13 11:13:34 2018 -0700
summary:     8207065: Cleanup compiler tests for Client VM

changeset:   51502:a602706ccaaa
user:        jjg
date:        Fri Jul 13 13:00:36 2018 -0700
summary:     8207213: The help-doc.html generated by the doclet is incomplete

changeset:   51503:dccdf51b10dd
user:        goetz
date:        Fri Jul 13 17:42:24 2018 +0200
summary:     8207233: Minor improvements of jdk C-coding

changeset:   51504:44483330f7cf
user:        dsamersoff
date:        Sun Jul 15 20:15:17 2018 +0300
summary:     8206265: aarch64 jtreg: assert in TestOptionsWithRanges.jtr

changeset:   51505:3c0e39975ae5
user:        jlahoda
date:        Mon Jul 16 12:58:49 2018 +0200
summary:     8189747: JDK9 javax.lang.model.util.Elements#getTypeElement regressed 1000x in performance.

changeset:   51506:d7c4c42ab260
user:        jlahoda
date:        Mon Jul 16 16:31:33 2018 +0200
summary:     8207032: Compilation succeeds without checking readability when --add-exports used

changeset:   51507:40ef1bb91ee8
user:        lucy
date:        Mon Jul 16 16:57:37 2018 +0200
summary:     8206271: CodeHeap State Analytics must digest new method state

changeset:   51508:b6b9a2515525
user:        bpb
date:        Mon Jul 16 10:58:28 2018 -0700
summary:     8206448: (fs) Extended attributes assumed to be enabled on ext3 (lnx)

changeset:   51509:a25c48c0a1ab
user:        dlong
date:        Mon Jul 16 15:09:19 2018 -0700
summary:     8181855: [Graal] runtime/ReservedStack/ReservedStackTest.java triggers: assert(thread->deopt_mark() == __null) failed: no stack overflow from deopt blob/uncommon trap

changeset:   51510:c2e676c2cf7b
user:        pmuthuswamy
date:        Tue Jul 17 16:49:55 2018 +0530
summary:     8207190: JDK 11 javadoc generates bad code example

changeset:   51511:f0193a4828ef
user:        chegar
date:        Tue Jul 17 12:22:41 2018 +0100
summary:     8207265: Bad HTML in {@link} in HttpResponse.BodySubscribers.ofPublisher

changeset:   51512:0a018efec082
parent:      51507:40ef1bb91ee8
user:        coleenp
date:        Tue Jul 10 11:13:33 2018 -0400
summary:     8206471: Race with ConcurrentHashTable deleting items on insert with cleanup thread

changeset:   51513:d379f06962cf
parent:      51512:0a018efec082
parent:      51511:f0193a4828ef
user:        coleenp
date:        Tue Jul 17 09:37:24 2018 -0400
summary:     Merge

changeset:   51514:9502e3b9d415
user:        weijun
date:        Tue Jul 17 22:22:00 2018 +0800
summary:     8207318: KeyStore#getInstance(File, LoadStoreParameter) does not load the keystore

changeset:   51515:8a07817a6c57
user:        aph
date:        Tue Jul 17 15:28:17 2018 +0100
summary:     8207345: AArch64: Trampoline generation code reads from unitialized memory

changeset:   51516:e15cd424736d
user:        dpochepk
date:        Tue Jul 17 19:25:45 2018 +0300
summary:     8207240: AARCH64: C2-only VM does not build

changeset:   51517:a0de9a3a6766
user:        apetcher
date:        Tue Jul 17 13:04:40 2018 -0400
summary:     8206929: Check session context for TLS 1.3 session resumption

changeset:   51518:610d15624bdd
user:        dtitov
date:        Tue Jul 17 11:20:16 2018 -0700
summary:     8207261: [Graal] JDI and JDWP tests that consume all memory should be filtered out to not run with Graal

changeset:   51519:6d6611346837
user:        jcbeyler
date:        Tue Jul 17 15:09:27 2018 -0700
summary:     8205541: serviceability/jvmti/HeapMonitor/MyPackage/HeapMonitorStatArrayCorrectnessTest.java fails with Should not have any events stored yet.

changeset:   51520:e3bcc86855dd
user:        jcbeyler
date:        Tue Jul 17 17:52:03 2018 -0700
summary:     8205652: serviceability/jvmti/HeapMonitor/MyPackage/HeapMonitorStatRateTest.java fails

changeset:   51521:914f305ba6fa
user:        jcbeyler
date:        Tue Jul 17 19:59:38 2018 -0700
summary:     8205725: Update the JVMTI Spec for Heap Sampling

changeset:   51522:c95334202a14
user:        mdoerr
date:        Wed Jul 18 11:27:14 2018 +0200
summary:     8207342: error occurred during error reporting (printing register info)

changeset:   51523:1edcf36fe15f
tag:         jdk-11+23
user:        jcbeyler
date:        Wed Jul 18 11:57:51 2018 -0400
summary:     8207763: serviceability/jvmti/HeapMonitor/MyPackage/HeapMonitorStatRateTest.java failed with Error. Parse Exception: Can't find source file: HeapMonitorStatIntervalTest.java

changeset:   51524:bd4e51d12426
tag:         shenandoah-jdk-11+23
parent:      51477:3e42cf4cfd32
parent:      51523:1edcf36fe15f
user:        rkennke
date:        Fri Jul 27 11:10:20 2018 +0200
summary:     Merge

changeset:   51525:0731879b2ff7
user:        rkennke
date:        Fri Jul 27 11:10:30 2018 +0200
summary:     Added tag shenandoah-jdk-11+23 for changeset bd4e51d12426

changeset:   51526:2dd2d73c52f6
parent:      51523:1edcf36fe15f
user:        weijun
date:        Thu Jul 19 00:14:29 2018 +0800
summary:     8207250: setUseClientMode post handshake with the same value as before does not throw IAE

changeset:   51527:69dc9ea17b33
user:        weijun
date:        Thu Jul 19 00:14:40 2018 +0800
summary:     8202837: PBES2 AlgorithmId encoding error in PKCS12 KeyStore

changeset:   51528:dfa8a5be78c4
user:        shade
date:        Wed Jul 11 08:44:00 2018 +0200
summary:     8206931: Misleading "COMPILE SKIPPED: invalid non-klass dependency" compile log

changeset:   51529:7dc181cb3603
user:        epavlova
date:        Wed Jul 18 13:24:25 2018 -0700
summary:     8207380: compiler/graalunit/JttLangMTest.java timeout

changeset:   51530:04764dc834d0
user:        gromero
date:        Sun Jun 24 21:48:42 2018 -0400
summary:     8205580: PPC64: RTM: Don't retry lock on abort if abort was intentional

changeset:   51531:08c3167e2d22
user:        gromero
date:        Tue Jun 26 08:33:17 2018 -0400
summary:     8205581: PPC64: RTM: Fix abort on native calls

changeset:   51532:a1a53d240353
user:        gromero
date:        Fri Jul 06 16:25:07 2018 -0400
summary:     8205582: PPC64: RTM: Fix counter for aborts on nested transactions

changeset:   51533:959dbf7e96d0
user:        gromero
date:        Sat Jun 23 18:02:46 2018 -0400
summary:     8205390: jtreg: Fix failing TestRTMSpinLoopCount on PPC64

changeset:   51534:a2a25f5bfd18
user:        gromero
date:        Sun Jun 24 17:11:17 2018 -0400
summary:     8205578: jtreg: Fix failing TestRTMAbortRatio on PPC64

changeset:   51535:2449e681ac60
user:        epavlova
date:        Wed Jul 18 14:44:04 2018 -0700
summary:     8207761: Split compiler/graalunit/JttReflectFTest.java

changeset:   51536:d6b131d2bc8b
user:        vtewari
date:        Thu Jan 18 13:55:26 2018 +0530
summary:     8193419: Better Internet address support

changeset:   51537:edd69f959190
user:        serb
date:        Wed Jan 31 18:13:13 2018 -0800
summary:     8191239: Improve desktop file usage

changeset:   51538:78f16a9f7563
user:        igerasim
date:        Mon Feb 05 14:18:22 2018 -0800
summary:     8196224: Even better Internet address support

changeset:   51539:393f8a42190b
user:        sherman
date:        Thu Mar 15 16:04:30 2018 -0700
summary:     8199547: Exception to Pattern Syntax

changeset:   51540:c2c9c209e22a
user:        apetcher
date:        Mon Apr 09 14:10:56 2018 -0400
summary:     8200332: Improve GCM counting

changeset:   51541:da85dc1f0162
user:        smarks
date:        Thu May 31 11:31:20 2018 -0700
summary:     8197925: Better stack walking

changeset:   51542:e9bbd853944d
user:        vtewari
date:        Thu Jun 07 18:21:29 2018 +0530
summary:     8200666: Improve LDAP support

changeset:   51543:e2bf86b88863
user:        smarks
date:        Fri Jun 22 17:08:00 2018 -0700
summary:     8205491: adjust reflective access checks

changeset:   51544:3c0a5bf931e4
user:        amlu
date:        Thu Jul 19 10:30:24 2018 +0800
summary:     8207818: Problem list several rmi tests

changeset:   51545:1cf07877b739
user:        sspitsyn
date:        Wed Jul 18 20:54:12 2018 -0700
summary:     8207819: Problem list serviceability/jvmti/HeapMonitor/MyPackage/HeapMonitorStatRateTest.java

changeset:   51546:afe2cecf8867
user:        prr
date:        Thu Jul 19 09:42:15 2018 -0700
summary:     Added tag jdk-11+23 for changeset 1edcf36fe15f

changeset:   51547:52f96cca600f
user:        bobv
date:        Thu Jul 19 12:57:12 2018 -0400
summary:     8206456: [TESTBUG] docker jtreg tests fail on systems without cpuset.effective_cpus / cpuset.effective_mem

changeset:   51548:7cfc6c381cfa
user:        bulasevich
date:        Thu Jul 19 21:46:52 2018 +0300
summary:     8207584: ARM32: ShouldNotReachHere assertion on Test8168712 jtreg test

changeset:   51549:14b870bda24f
user:        kvn
date:        Thu Jul 19 13:41:56 2018 -0700
summary:     8207069: [AOT] we should check that VM uses the same GC as one used for AOT library generation.

changeset:   51550:fc24da4898f1
user:        erikj
date:        Thu Jul 19 14:25:42 2018 -0700
summary:     8207243: Fix translation filtering to also support zh_HK and zh_TW

changeset:   51551:0d2e45b25c3d
user:        zgu
date:        Wed Jul 11 13:55:38 2018 -0400
summary:     8207056: Epsilon GC to support object pinning

changeset:   51552:4630bb315ec0
user:        mli
date:        Fri Jul 20 08:40:14 2018 +0800
summary:     8207244: java/nio/channels/Selector/SelectWithConsumer.java testInterruptDuringSelect() fails intermittently

changeset:   51553:e750c1a054fa
user:        jcbeyler
date:        Thu Jul 19 18:21:24 2018 -0700
summary:     8207765: HeapMonitorStatIntervalTest.java fails with ZGC

changeset:   51554:6ed2290ba410
user:        mli
date:        Fri Jul 20 15:24:42 2018 +0800
summary:     8207833: java/nio/channels/Selector/SelectWithConsumer.java testCancel() fails intermittently

changeset:   51555:a138b5fe288d
user:        rraghavan
date:        Fri Jul 20 01:23:38 2018 -0700
summary:     8203504: [Graal] org.graalvm.compiler.debug.test.DebugContextTest fails with java.util.ServiceConfigurationError

changeset:   51556:24c4780f69a5
user:        goetz
date:        Fri Jul 20 09:33:49 2018 +0200
summary:     8207766: [testbug] Adapt tests for Aix.

changeset:   51557:67736b4846a0
user:        goetz
date:        Fri Jul 20 09:46:57 2018 +0200
summary:     8207830: [aix] disable jfr in build and tests

changeset:   51558:936823fcf202
user:        erikj
date:        Fri Jul 20 09:07:37 2018 -0700
summary:     8207365: Make man pages optional

changeset:   51559:e429a304c97d
user:        ascarpino
date:        Fri Jul 20 09:55:15 2018 -0700
summary:     8204196: integer cleanup

changeset:   51560:79926aa725f7
user:        naoto
date:        Fri Jul 20 10:12:34 2018 -0700
summary:     8206886: Java does not set the default format locale correctly on mac10.13

changeset:   51561:bfcdf06f97fa
user:        iignatyev
date:        Fri Jul 20 11:39:37 2018 -0700
summary:     8207915: [AOT] jaotc w/ '--ignore-errors' should ignore illegal class files

changeset:   51562:e5c3953c5f88
user:        epavlova
date:        Fri Jul 20 11:39:52 2018 -0700
summary:     8206241: compiler/graalunit/PhasesCommonTest.java fails with java.lang.Error: TESTBUG: no tests found for prefix org.graalvm.compiler.phases.common.test

changeset:   51563:23167d80e0f2
user:        smarks
date:        Fri Jul 20 14:34:51 2018 -0700
summary:     8206865: RMI activation tests fail with InvalidClassException

changeset:   51564:b65916c52e3c
user:        coleenp
date:        Fri Jul 20 18:03:23 2018 -0400
summary:     8203820: [TESTBUG] vmTestbase/metaspace/staticReferences/StaticReferences.java timed out

changeset:   51565:d5138f8da1ba
user:        weijun
date:        Sat Jul 21 21:46:42 2018 +0800
summary:     8207223: SSL Handshake failures are reported with more generic SSLException

changeset:   51566:7efacf6d4cc6
user:        xiaofeya
date:        Mon Jul 23 10:02:10 2018 +0800
summary:     8207952: Problem-list 3 sctp tests

changeset:   51567:dd1aa4229fd4
user:        jcbeyler
date:        Sun Jul 22 20:00:39 2018 -0700
summary:     8207252: C1 still does eden allocations when TLAB is enabled

changeset:   51568:50eb2c0f252b
user:        gromero
date:        Thu Jul 19 16:56:05 2018 -0400
summary:     8189922: UseNUMA memory interleaving vs membind

changeset:   51569:d9b22cbe3e7a
user:        sdama
date:        Mon Jul 23 19:58:43 2018 +0530
summary:     8206445: JImageListTest.java failed in Windows

changeset:   51570:ed66516bab5b
user:        dcubed
date:        Mon Jul 23 14:41:06 2018 -0400
summary:     8208092: ProblemList serviceability/sa/ClhsdbCDSCore.java

changeset:   51571:087c3ba2d138
user:        dlong
date:        Mon Jul 23 12:01:43 2018 -0700
summary:     8207383: [Graal] SelfChangedCDS.java fails with "guarantee(disp == (intptr_t)(jint)disp) failed: must be 32-bit offset"

changeset:   51572:17b7d7034e8e
user:        valeriep
date:        Mon Jul 23 23:18:19 2018 +0000
summary:     8206171: Signature#getParameters for RSASSA-PSS throws ProviderException when not initialized

changeset:   51573:9c1d9d1fb543
user:        mli
date:        Tue Jul 24 13:55:57 2018 +0800
summary:     8208111: Problem list java/nio/channels/Selector/RacyDeregister.java

changeset:   51574:1d8b1d4eae6a
user:        chegar
date:        Mon Jul 23 11:47:03 2018 +0100
summary:     8207959: The initial value of SETTINGS_MAX_CONCURRENT_STREAMS should have no limit

changeset:   51575:ad1fa1db73d9
user:        chegar
date:        Tue Jul 24 10:07:26 2018 +0100
summary:     8207960: Non-negative WINDOW_UPDATE increments may leave the stream window size negative

changeset:   51576:ceebbc92b3b0
user:        ghaug
date:        Tue Jul 24 12:57:40 2018 +0200
summary:     8207392: [PPC64] Implement JFR profiling.

changeset:   51577:5cff3e41d003
user:        cjplummer
date:        Tue Jul 24 10:35:25 2018 -0700
summary:     8208075: Quarantine vmTestbase/nsk/jvmti/RedefineClasses/StressRedefineWithoutBytecodeCorruption/TestDescription.java

changeset:   51578:049b2037b5d8
user:        rhalade
date:        Tue Jul 24 12:12:16 2018 -0700
summary:     8203230: update VerifyCACerts test

changeset:   51579:a90d8198d7e4
user:        chegar
date:        Wed Jul 25 10:08:39 2018 +0100
summary:     8207846: Generalize the jdk.net.includeInExceptions security property

changeset:   51580:ea900a7dc7d7
tag:         jdk-11+24
user:        erikj
date:        Wed Jul 25 08:36:46 2018 -0700
summary:     8208096: Update build documentation to reflect compiler upgrades at Oracle

changeset:   51581:059720be4d3d
tag:         shenandoah-jdk-11+24
parent:      51525:0731879b2ff7
parent:      51580:ea900a7dc7d7
user:        rkennke
date:        Fri Jul 27 11:55:13 2018 +0200
summary:     Merge

changeset:   51582:719114b4040f
user:        rkennke
date:        Fri Jul 27 11:57:51 2018 +0200
summary:     Added tag shenandoah-jdk-11+24 for changeset 059720be4d3d

changeset:   51583:628718bf8970
parent:      51580:ea900a7dc7d7
user:        dcubed
date:        Wed Jul 25 12:32:06 2018 -0400
summary:     8208189: ProblemList compiler/graalunit/JttThreadsTest.java

changeset:   51584:7087c6657f35
user:        jnimeh
date:        Wed Jul 25 09:48:31 2018 -0700
summary:     8207237: SSLSocket#setEnabledCipherSuites is accepting empty string

changeset:   51585:224c202c02a5
user:        jcbeyler
date:        Wed Jul 25 10:51:16 2018 -0700
summary:     8207765: HeapMonitorTest.java intermittent failure

changeset:   51586:ec6d5843068a
user:        dcubed
date:        Wed Jul 25 15:38:37 2018 -0400
summary:     8208205: ProblemList tests that fail due to 'Error attaching to process: Can't create thread_db agent!'

changeset:   51587:f6c70dedae1a
user:        cjplummer
date:        Wed Jul 25 13:15:36 2018 -0700
summary:     8151259: [TESTBUG] nsk/jvmti/RedefineClasses/redefclass030 fails with "unexpected values of outer fields of the class" when running with -Xcomp

changeset:   51588:9e04723f53c7
user:        dcubed
date:        Wed Jul 25 17:22:25 2018 -0400
summary:     8208226: ProblemList com/sun/jdi/BasicJDWPConnectionTest.java

changeset:   51589:d31dcfaa96f3
user:        xuelei
date:        Wed Jul 25 17:21:04 2018 -0700
summary:     8208166: Still unable to use custom SSLEngine with default TrustManagerFactory after JDK-8207029

changeset:   51590:f095e3bc2d41
user:        jjiang
date:        Thu Jul 26 08:46:27 2018 +0800
summary:     8206258: [Test Error] sun/security/pkcs11 tests fail if NSS libs not found

changeset:   51591:73f3487f271d
user:        ljiang
date:        Wed Jul 25 22:48:53 2018 -0700
summary:     8207948: JDK 11 L10n resource file update msg drop 10

changeset:   51592:13e816d02c25
user:        rgoel
date:        Thu Jul 26 14:15:24 2018 +0530
summary:     8206965: java/util/TimeZone/Bug8149452.java failed on de_DE and ja_JP locale.

changeset:   51593:21ce0a9e592a
user:        simonis
date:        Mon Jul 23 15:17:14 2018 +0200
summary:     8205608: Fix 'frames()' in ThreadReferenceImpl.c to prevent quadratic runtime behavior

changeset:   51594:3fe0329588b8
user:        jlaskey
date:        Thu Jul 26 10:25:33 2018 -0300
summary:     8208164: (str) improve specification of String::lines

changeset:   51595:a87d1966c35c
user:        prr
date:        Thu Jul 26 09:27:30 2018 -0700
summary:     Added tag jdk-11+24 for changeset ea900a7dc7d7

changeset:   51596:56e97a1cbea5
tag:         tip
parent:      51582:719114b4040f
parent:      51595:a87d1966c35c
user:        rkennke
date:        Fri Jul 27 11:58:27 2018 +0200
summary:     Merge