8148328: aarch64: redundant lsr instructions in stub code. Summary: avoid redundant lsr instructions in jbyte_arraycopy and jbyte_disjoint_arraycopy. Reviewed-by: aph Contributed-by: felix.yang@linaro.org

8146478: Node limit exceeded with -XX:AllocateInstancePrefetchLines=1073741823 Summary: Constrain the set of accepted values for the Allocate{PrefetchLines, InstancePrefetchLines, PrefetchStepSize, PrefetchDistance} flags. Increase macro node expansion budget. Reviewed-by: kvn

8148970: Quarantine testlibrary_tests/whitebox/vm_flags/IntxTest.java Summary: Quarantine testlibrary_tests/whitebox/vm_flags/IntxTest.java Reviewed-by: vlivanov, dcubed

Added tag jdk-9+105 for changeset d549e724be36

8145789: Switch JDK 9 to use Jib in JPRT Reviewed-by: ihse, tbell

8149647: Incremental enhancements from build-infra Reviewed-by: erikj

Merge

8149116: Make test/Makefile more silent Reviewed-by: mikael, erikj

8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD Reviewed-by: ihse, tbell

8148861: Update jaxws to use the new non-inheriting thread-local Thread constructor Reviewed-by: mkos, mchung

8147754: Configure fails to detect freetype installed by XQuartz on OSX 10.11 Reviewed-by: erikj, ihse

Added tag jdk-9+105 for changeset d0b71f2375d0

Added tag jdk-9+105 for changeset db483b34fa71

Merge

Merge

Merge

8080357: JShell: Only unqualified unresolved references should be corralled 8081431: JShell: Dropping import should update dependencies Reviewed-by: jlahoda

8147949: NetBeans cannot open langtools repository because of the reserved word \"aux\" Summary: Dropping unnecessary references to artificial "aux" source roots. Reviewed-by: mcimadamore

Added tag jdk-9+104 for changeset 09c25109769a

Merge

Added tag jdk-9+104 for changeset 59fc48a1a885

Merge

Merge

8144593: Suppress not recognized property/feature warning messages from SAXParser Reviewed-by: joehw

Added tag jdk-9+104 for changeset c6f848cc2750

Merge

8149334: JSON.parse(JSON.stringify([])).push(10) creates an array containing two elements Reviewed-by: jlaskey, sundar

8149186: Don't use indy for optimistic arithmetic Reviewed-by: mhaupt, sundar

Merge

8148926: Call site profiling fails on braces-wrapped anonymous function Reviewed-by: jlaskey, hannesw

Added tag jdk-9+104 for changeset a077e87423b1

Merge

Added tag jdk-9+104 for changeset a8ace34fedbc

Merge

8098581: SecureRandom.nextBytes() hurts performance with small size requests Reviewed-by: valeriep

8064466: (fs spec) Files.readAttributes(Path, String, LinkOption...) not clear when called with zero attributes Summary: Change specification to indicate "one or more" instead of "zero or more" attributes. Reviewed-by: alanb

8138578: MethodHandles.Lookup.findSpecial() Javadoc fails to consider static methods Reviewed-by: psandoz, vlivanov, mhaupt Contributed-by: Shilpi Rastogi <shilpi.rastogi@oracle.com>

8146747: java.time.Duration.toNanos() and toMillis() exception on negative durations Reviewed-by: rriggs, scolebourne

8148838: Stream.flatMap(...).spliterator() cannot properly split after tryAdvance() Reviewed-by: psandoz

8148115: Stream.findFirst for unordered source optimization Reviewed-by: psandoz

8148250: Stream.limit() parallel tasks with ordered non-SUBSIZED source should short-circuit Reviewed-by: psandoz

8148629: Disable remaining warnings in awt/fontmanager Reviewed-by: ihse

8148928: java/util/stream/test/**/SequentialOpTest.java timed out intermittently Reviewed-by: psandoz Contributed-by: huaming.li@oracle.com

Merge

8149044: jdk/internal/misc/JavaLangAccess/FormatUnsigned.java fails all platforms Summary: Remove the obsolete FormatUnsigned test. Reviewed-by: darcy

8148936: Adapt UUID.toString() to Compact Strings Reviewed-by: igerasim, redestad

8148955: libjimage.so compiled with wrong flags Reviewed-by: alanb

8149003: Mark more jdk_core tests as intermittently failing Reviewed-by: chegar, darcy

8148983: Fix extra comma in changes for JDK-8148916 Reviewed-by: jjg

8148821: (fs) Path.getParent() javadoc error Summary: Change "If this path has one or more elements" to "If this path has more than one element." Reviewed-by: rriggs, alanb

8148916: Mark bug6400879.java as intermittently failing Reviewed-by: serb

8072379: Implement jdk.Version Reviewed-by: alanb, darcy, dfuchs, ihse, ksrini, mchung, rriggs

8148869: StringConcatFactory MH_INLINE_SIZED_EXACT strategy does not work with -XX:-CompactStrings Reviewed-by: vlivanov, psandoz

8148891: Multiple failing javax/imageio/plugins after client integration Summary: Add failing tests to problem list for all platforms until the underlying issue is fixed. Reviewed-by: prr

8146249: libjimage should use delete[] with new[] Reviewed-by: jlaskey

Merge

Merge

8147966: [TEST] add a test for multiresolution image properties Reviewed-by: alexsch

8074165: Deprecate support for AppletViewer Reviewed-by: almatvee, ssadetsky

8146881: [TEST] update some imageio plugins tests to affect TIFF format Reviewed-by: serb, ssadetsky

Merge

8146276: Right aligned ToolBar component does not appear Reviewed-by: alexsch, psadhukhan

8139213: [macosx] Mac OS X Aqua Look and Feel: JOptionPane can truncate the first button Reviewed-by: alexsch, psadhukhan

7104635: HTMLEditorKit fails to write down some html files Reviewed-by: serb, alexsch

8147443: Use the Common Cleaner in Marlin OffHeapArray Summary: OffHeapArray clean-up to use the jdk.internal.ref.Cleaner to free unsafe arrays (PhantomReference) Reviewed-by: prr, rriggs, mchung

8147407: Provide support of WaveExtensible sound format Reviewed-by: prr, amenkov

8064800: AudioSystem/WaveFileWriter can't write PCM_FLOAT, but writes it anyway Reviewed-by: prr, amenkov

6459818: Audio A-law and law decoder skip() method not implemented Reviewed-by: amenkov

8146144: Incorrect behaviour of AudioSystem.getTargetFormats/getTargetEncodings/isConversionSupported Reviewed-by: amenkov

8131974: AudioFileReader incorrectly handle EOFException Reviewed-by: amenkov

8080492: [Parfait] Uninitialised variable in jdk/src/java/desktop/windows/native/libawt/ Reviewed-by: prr, vadim

8015748: [macosx] JProgressbar with Aqua LaF ignores JProgressbar#applyComponentOrientation(ComponentOrientation.RIGHT_TO_LEFT) call. Reviewed-by: rchamyal, alexsch

7035459: [TEST_BUG] java/awt/Focus/TranserFocusToWindow/TranserFocusToWindow.java failed Reviewed-by: serb, arapte Contributed-by: prem.balakrishnan@oracle.com

8144744: ImageWriter.replacePixels() specification is incorrect regarding null ImageWriteParam Reviewed-by: prr, psadhukhan

8143562: JPEG reader returns null for getRawImageType() Reviewed-by: prr, arapte

8146317: Memory leak in wcstombsdmp Reviewed-by: serb, psadhukhan, ssadetsky Contributed-by: Alex Henrie <alexhenrie24@gmail.com>

7087869: [TEST_BUG] [macosx] No mac os x support in test java/awt/Mouse/ExtraMouseClick/ExtraMouseClick Reviewed-by: serb, arapte Contributed-by: manajit.halder@oracle.com

8016665: [macosx] JComponent behaviour doesn't comply API documentation (setComponentOrientation method), Aqua LAF Reviewed-by: serb, alexsch

8041894: [macosx] Test javax/swing/JSpinner/8008657/bug8008657.java failed on Mac Reviewed-by: serb, alexsch

8145735: Tests api/javax_swing/JTabbedPane/AccessibleJTabbedPane/* are failing Summary: Try indexOfComponent before indexOfTabComponent Reviewed-by: van, alexsch Contributed-by: peter.brunet@oracle.com

8145776: [TEST] add a test checking multipage tiff creation Reviewed-by: bpb, serb, ssadetsky

8023213: [macosx] closed/java/awt/FontClass/NaNTransform.java fails on MacOS X 10.9 Reviewed-by: prr, serb

4769772: JInternalFrame.setIcon(true) before JDesktopPane.add(JIF) causes wrong state Reviewed-by: alexsch, aivanov

Merge

8145784: [PIT] closed/java/awt/Robot/SpuriousMouseEvents/SpuriousMouseEvents.java fails Reviewed-by: alexsch, serb

8138838: docs cleanup for java.desktop Summary: docs cleanup for java.desktop Reviewed-by: serb

8143316: Crash Trend in 1.9.0-ea-b93 (sun.awt.DefaultMouseInfoPeer.fillPointWithCoords) Reviewed-by: serb

8146076: Fail of sun/java2d/marlin/CeilAndFloorTests.java with Jigsaw Summary: Added jtreg tag @modules java.desktop/sun.java2d.marlin Reviewed-by: prr

8145584: java/awt/font/TextLayout/TestGetPixelBounds.java fails on Linux Reviewed-by: serb, jgodinez

8145060: Minimizing a JInternal frame not shifting focus to frame below it Reviewed-by: serb, alexsch

Merge

8144991: AIOOB Exception in AutoImageWriterTest with TIFF writer Summary: In TIFFImageWriter call reset() in setOuput() when output != null. Reviewed-by: prr

8145113: OutOfMemoryError when reading a 17KB corrupted TIFF image Summary: Add checks on size of field count and size of field data and consistency of data offsets and byte counts. Reviewed-by: prr

8146168: [TEST_BUG] instability of java/awt/Frame/MaximizedToMaximized/MaximizedToMaximized.java Reviewed-by: serb, rchamyal

6961123: setWMClass fails to null-terminate WM_CLASS string Reviewed-by: serb

8143054: [macosx] KeyEvent modifiers do not contain information about mouse buttons Reviewed-by: ssadetsky, alexsch

8135088: Typo in AuFileReader Reviewed-by: prr, amenkov

8143150: DrawImagePipe can skip some unnecessary blits Reviewed-by: flar

8145808: java/awt/Graphics2D/MTGraphicsAccessTest/MTGraphicsAccessTest.java hangs on Win. 8 Reviewed-by: serb, flar

8041928: MouseEvent.getModifiersEx gives wrong result Reviewed-by: alexsch, serb, rchamyal Contributed-by: ambarish.rapte@oracle.com

8145785: [TEST_BUG] java/awt/Toolkit/GetSizeTest/GetScreenSizeTest.java: incorrect name Reviewed-by: serb

Merge

8133039: Provide public API to sun.swing.UIAction#isEnabled(Object) Reviewed-by: serb, azvegint

8144488: Compilation fails on Jake for regtest javax/swing/JMenu/8067346/bug8067346.java Reviewed-by: alexsch, serb

8145608: PNG writer should permit setting compression level and iDAT chunk maximum size Reviewed-by: serb, prr

8146508: 6488522 was committed with incorrect author attribution. Reviewed-by: bpb

6488522: PNG writer should permit setting compression level and iDAT chunk maximum size Reviewed-by: serb, prr

8144718: Pisces / Marlin Strokers may generate invalid curves with huge coordinates and round joins Reviewed-by: flar, prr

8145116: [TEST_BUG] Incorrect binary comparison in java/awt/event/KeyEvent/ExtendedModifiersTest/ExtendedModifiersTest.java Reviewed-by: ssadetsky, jdv

8145344: Add SHA1 and SHA-224 to preferred provider list for solaris-sparc Reviewed-by: vinnie, jnimeh

Merge

8148117: Move sun.misc.Cleaner to jdk.internal.ref Reviewed-by: alanb, rriggs

8141452: Convert between TimeUnit and ChronoUnit Reviewed-by: martin, psandoz, chegar, rriggs, scolebourne Contributed-by: nadeesh.tv@oracle.com

8148787: StringConcatFactory exactness check produces bad bytecode when a non-arg concat is requested Reviewed-by: vlivanov, psandoz

8147912: test "parseWithZoneWithoutOffset" of java/time/tck/java/time/format/TCKDTFParsedInstant.java fail on de_DE locale Summary: Even though hardcoded data is not preferred in compatibility test cases, this case was exception. English is provided as the default locale data for DateTimeFormatter in this testcase. Reviewed-by: okutsu, scolebourne

6659240: Exceptions thrown by MXBeans wrongly documented in j.l.m.ManagementFactory Reviewed-by: dfuchs, jbachorik Contributed-by: sharath.ballal@oracle.com

8148710: Remove FlatMapOpTest.java from ProblemList.txt Reviewed-by: psandoz Contributed-by: huaming.li@oracle.com

Merge

Merge

Merge

Merge

Merge

Merge

8141615: Add new public methods to sun.reflect.ConstantPool Reviewed-by: twisti, iignatyev, coleenp

Merge

8143353: update for x86 sin and cos in the math lib Summary: Optimize Math.sin() and cos() for 64 and 32 bit X86 architecture using Intel LIBM implementation. Reviewed-by: kvn

8135250: Replace custom check/range functionality with check index/range methods in java.util.Objects Reviewed-by: jrose, kvn Contributed-by: kishor.kharbas@intel.com

Merge

8147791: Reenable tests that was temporarily quarantined in jdk9/hs Reviewed-by: dholmes, mgerdin

Merge

Merge

8147494: com/sun/management/HotSpotDiagnosticMXBean/CheckOrigin.java fails with "java.lang.IllegalArgumentException: VM option 'TraceExceptions' does not exist" Summary: Substituted "CheckJNICalls" for "TraceExceptions" product option in test Reviewed-by: hseigel, coleenp, dcubed

Merge

Merge

Merge

8143317: jdk/lambda/vm/InterfaceAccessFlagsTest.java fails with IncompatibleClassChangeError Summary: ClassToInterfaceConverter.java converts class to interface without changing corresponding method tag to interface method tag. This leads failure after 8145148. Reviewed-by: psandoz, hseigel

Merge

8146015: JMXInterfaceBindingTest is failing intermittently for IPv6 addresses Reviewed-by: dfuchs, sspitsyn

Merge

8143016: java/time/test/java/time/TestClock_System.java failed intermittently Reviewed-by: lancea, scolebourne

8146773: java/lang/ref/CleanerTest.java CleanerTest.testRefSubtypes() fails 8148352: CleanerTest fails: Cleanable should have been freed Summary: relax gc timing constraints Reviewed-by: dfuchs

8146218: Add LocalDate.datesUntil method producing Stream<LocalDate Reviewed-by: scolebourne, rriggs, sherman

Added tag jdk-9+104 for changeset f57a51dbcc50

Merge

Merge

Merge

Merge

8148240: aarch64: random infrequent null pointer exceptions in javac Summary: Disable fp as an allocatable register Reviewed-by: aph

8148202: move lookup of Java class and hub from ResolvedJavaType to ConstantReflectionProvider Reviewed-by: twisti Contributed-by: christian.wimmer@oracle.com

Merge

8147876: ciTypeFlow::is_dominated_by() writes outside dominated array Summary: ciTypeFlow::is_dominated_by() should use block_count() instead of _methodBlocks->num_blocks(). Reviewed-by: neliasso, vlivanov, kvn

Merge

8147853: "assert(t->meet(t0) == t) failed: Not monotonic" with sun/util/calendar/zi/TestZoneInfo310.java Summary: type of counted loop Phi may be saturated before special code to handle counted loops kicks in Reviewed-by: kvn

Merge

8147470: update JVMCI mx extensions Reviewed-by: twisti

8148136: compile control tests have incorrect @build directives Reviewed-by: kvn

8148161: quarantine compiler/loopopts/UseCountedLoopSafepoints.java Reviewed-by: kvn

8148101: [JVMCI] Make CallingConvention.Type extensible Reviewed-by: twisti

8147937: Adapt SAP copyrights to new company name. Reviewed-by: simonis, stuefe

8146424: runtime/ReservedStack/ReservedStackTest.java triggers: assert(thread->deopt_mark() == __null) failed: no stack overflow from deopt blob/uncommon trap Reviewed-by: twisti

8147432: JVMCI should report bailouts in PrintCompilation output Reviewed-by: kvn, twisti

8146244: compiler/jvmci/code/DataPatchTest.java crashes: SIGSEGV in (getConstClass)getConstClass Reviewed-by: twisti

8065334: CodeHeap expansion fails although there is uncommitted memory Summary: CodeHeap::expand_by() should commit remaining space if requested expansion size is too large. Reviewed-by: kvn

8141557: TestResolvedJavaMethod.java times out after 1000 ms Reviewed-by: twisti

Merge

8145800: [Testbug] CompilerControl: inline message differs for not inlined methods Summary: Create callables outside the Internal subclasses Reviewed-by: kvn

Merge

8147386: assert(size == calc_size) failed: incorrect size calculattion x86_32.ad Summary: incorrect offset used in spill code for vectors Reviewed-by: vlivanov, kvn, mcberg

8147805: aarch64: C1 segmentation fault due to inline Unsafe.getAndSetObject Summary: In Aarch64 LIR_Assembler.atomic_op, keep stored data reference register in decompressed forms as it may be used later Reviewed-by: aph Contributed-by: hui.shi@linaro.org, felix.yang@linaro.org

8147475: compiler/jvmci/code/SimpleDebugInfoTest.java fails in Assembler::locate_operand: ShouldNotReachHere() Reviewed-by: kvn, twisti

8147599: [JVMCI] simplify code installation interface Reviewed-by: twisti

8145336: PPC64: fix string intrinsics after CompactStrings change Reviewed-by: mdoerr, aph, kvn

8147564: [JVMCI] remove unused method CodeCacheProvider.needsDataPatch Reviewed-by: twisti

8146709: AArch64: Incorrect use of ADRP for byte_map_base Reviewed-by: roland

8146999: hotspot/test/compiler/c2/8007294/Test8007294.java test nightly failure Summary: uncast() fails with CheckCastPP Reviewed-by: kvn, thartmann

8146843: aarch64: add scheduling support for FP and vector instructions Summary: add pipeline classes for FP/vector pipeline Reviewed-by: aph

8147433: PrintNMethods no longer works with JVMCI Reviewed-by: kvn, twisti

Merge

6675699: need comprehensive fix for unconstrained ConvI2L with narrowed type Summary: Emit CastII to make narrow ConvI2L dependent on the corresponding range check. Reviewed-by: kvn, roland

8144212: JDK 9 b93 breaks Apache Lucene due to compact strings Summary: String compress/inflate intrinsics need to capture char and byte memory. Reviewed-by: aph, roland, kvn

8147444: compiler/jsr292/NonInlinedCall/RedefineTest.java fails with NullPointerException in ClassFileInstaller Summary: Removed installing of unused class. Added error output to ClassFileInstaller. Reviewed-by: vlivanov, zmajo

8147441: Unchecked pending exceptions in the WhiteBox API's implementation Summary: Add checks for pending exceptions. Reviewed-by: kvn

8146820: JVMCI options should not use System.getProperty directly Reviewed-by: kvn, dnsimon

8146983: C1: assert(appendix.not_null()) failed for invokehandle bytecode Reviewed-by: roland

6985422: flush the output streams before OnError commands Reviewed-by: kvn

8140001: _allocateInstance intrinsic does not throw InstantiationException for abstract classes and interfaces Reviewed-by: kvn, shade

8145025: compiler/compilercontrol/commandfile/CompileOnlyTest.java and compiler/compilercontrol/commands/CompileOnlyTest.java fail: java.lang.RuntimeException: Summary: Fix incorrect compileonly setting Reviewed-by: kvn, neliasso

Merge

8146364: Remove @ServiceProvider mechanism from JVMCI Reviewed-by: twisti

8145331: SEGV in DirectivesStack::release(DirectiveSet*) Summary: getDefaultDirective was not updated in 8144873 Reviewed-by: twisti, kvn

8071864: compiler/c2/6772683/InterruptedTest.java failed in nightly Summary: Increase the amount of time the main thread waits for the worker thread. Reviewed-by: kvn

Merge

8146891: AArch64 needs patch for 8032463 Reviewed-by: kvn

8146978: PPC64: Fix build after integration of C++ interpreter removal Reviewed-by: goetz

8146792: Predicate moved after partial peel may lead to broken graph Summary: partial peel can leave a pinned node between predicates and loop and prevent some loop predication Reviewed-by: kvn

8146246: JVMCICompiler::abort_on_pending_exception: assert(!thread->owns_locks()) failed: must release all locks when leaving VM Reviewed-by: coleenp, kvn

Merge

Merge

8141615: Add new public methods to sun.reflect.ConstantPool Reviewed-by: twisti, iignatyev, coleenp

8146886: aarch64: fails to build following 8136525 and 8139864 Summary: Fix several build errors and warnings Reviewed-by: aph

8136469: OptimizeStringConcat fails on pre-sized StringBuilder shapes Summary: Cut off dead if branch already during parsing (GVN). Reviewed-by: shade, kvn, roland

8146629: Make phase->is_IterGVN() accessible from Node::Identity and Node::Value Summary: Change arguments of Node::Identity() and Node::Value() from PhaseTransform* to PhaseGVN*. Reviewed-by: kvn, roland

Merge

8145322: Code generated from unsafe loops can be slightly improved Summary: improve code generated from checkIndex and unsafe loops Reviewed-by: kvn, thartmann

8086053: Address inconsistencies regarding ZeroTLAB Summary: Add zero-initialization to C1 for fast TLAB refills; strenghten C2 conditions for skipping zero-initialization. Reviewed-by: kvn, thartmann

8146705: Improve JVMCI support for blocking compilation Reviewed-by: twisti, never, iveresov

Merge

8139771: Eliminating CastPP nodes at Phis when they all come from a unique input may cause crash Summary: Lost dependency when CastPP at Phis are eliminate Reviewed-by: kvn

8133612: new clone logic added in 8042235 is missing from compiler intrinsics Reviewed-by: roland

8140659: C1: invokedynamic call patching violates JVMS-6.5.invokedynamic Reviewed-by: roland

8071374: -XX:+PrintAssembly -XX:+PrintSignatureHandlers crash fastdebug VM with assert(limit == __null || limit <= nm->code_end()) in RelocIterator::initialize Reviewed-by: kvn, iklam, shade

8146613: PPC64: C2 does no longer respect int to long conversion for stub calls Reviewed-by: kvn, goetz

8143353: update for x86 sin and cos in the math lib Summary: Optimize Math.sin() and cos() for 64 and 32 bit X86 architecture using Intel LIBM implementation. Reviewed-by: kvn

8146612: C2: Precedence edges specification violated Reviewed-by: kvn

8146678: aarch64: assertion failure: call instruction in an infinite loop Summary: Remove assertion Reviewed-by: aph

8146581: Minor corrections to the patch submitted for earlier bug id - 8143925 Reviewed-by: kvn Contributed-by: kishor.kharbas@intel.com

Merge

8147848: [TESTBUG] tmtools tests ported to JTREG need to be quarantined Summary: Quarantined some tests with false failures Reviewed-by: sla

Merge

8147509: [aix] Newlines missing in register info printout Reviewed-by: simonis

8147611: G1 - Missing memory barrier in start_cset_region_for_worker Reviewed-by: mgerdin, tschatzl

8146751: jdk/test/tools/launcher/TooSmallStackSize.java failed on Mac OS Reviewed-by: dholmes, gtriantafill

Merge

8147012: Fix includes in internalVMTests.cpp Reviewed-by: stefank, mgerdin

8129419: heapDumper.cpp: assert(length_in_bytes > 0) failed: nothing to copy Reviewed-by: dsamersoff

Merge

8146985: Change output directory for hotspot's jtreg tests Reviewed-by: erikj, mikael

Merge

8132717: Add tests checking that instances of j.l.Classes of a large size are allocated as Humongous Reviewed-by: jmasa, dfazunen

8132720: Add tests which checks that Humongous objects are not moved after Full GC Reviewed-by: jmasa, dfazunen

Merge

8146990: Convert CollectorPolicy to use log_warning instead of warning Reviewed-by: sjohanss, brutisso

8147464: Use LogConfiguration::configure_stdout() instead of parse_log_arguments Reviewed-by: mlarsson, sjohanss

8146994: Move internal vm tests to a separate file Reviewed-by: coleenp, stefank, kbarrett, mikael

8147482: Zero build fails after 8144953 Reviewed-by: coleenp, simonis

Merge

8145698: Memory leak in add_lib_info_fd of libproc_impl.c:174 Summary: Added missed free call Reviewed-by: jbachorik, sspitsyn

8145184: [aix] Implement os::platform_print_native_stack on AIX Reviewed-by: goetz

Merge

Merge