Skip to content
Snippets Groups Projects
  1. Mar 12, 2013
  2. Mar 11, 2013
    • Wouter Wolters's avatar
      [TASK] Cleanup filelist · 4b0c8c63
      Wouter Wolters authored
      Change-Id: If107bd20db15d1881c12097adecd342b8e1979aa
      Resolves: #45143
      Releases: 6.1
      Reviewed-on: https://review.typo3.org/18005
      Reviewed-by: Stefan Neufeind
      Reviewed-by: Philipp Gampe
      Tested-by: Philipp Gampe
      Reviewed-by: Oliver Klee
      Reviewed-by: Felix Kopp
      Reviewed-by: Christian Kuhn
      Tested-by: Christian Kuhn
      4b0c8c63
    • Wouter Wolters's avatar
      [TASK] Cleanup sysext "taskcenter" and "tsconfig_help" · b70403a1
      Wouter Wolters authored
      Change-Id: I2658e5d0a7ae979f93b60713294adcbe8e41db09
      Resolves: #46145
      Releases: 6.1
      Reviewed-on: https://review.typo3.org/18822
      Reviewed-by: Christian Kuhn
      Tested-by: Christian Kuhn
      b70403a1
    • Jost Baron's avatar
      [TASK] Show better error messages on failed TER update · e564ba71
      Jost Baron authored
      This patch shows error messages in a flash message if the ajax request
      for a TER-update fails, and resets the extension manager into a sane
      state, instead of showing an ever spinning wheel.
      
      Resolves: #46030
      Releases: 6.1
      Change-Id: I1cc67460a11feb206c53c12a38ad0f6db482e04a
      Reviewed-on: https://review.typo3.org/18688
      Reviewed-by: Wouter Wolters
      Tested-by: Wouter Wolters
      Reviewed-by: Christian Kuhn
      Tested-by: Christian Kuhn
      e564ba71
    • Stefan Neufeind's avatar
      [FEATURE] sys_note: Display/functionality for hover/context menu · d952d1dd
      Stefan Neufeind authored
      In page-module content-elements only show icons when hovered
      and they have a contextmenu on the icon.
      
      Add same functionality for sys_note
      
      Change-Id: I170309ac5ffe8b9cfa25ba1c9933d69ddcbcbca8
      Resolves: #43496
      Releases: 6.1
      Reviewed-on: https://review.typo3.org/16911
      Reviewed-by: Anja Leichsenring
      Tested-by: Anja Leichsenring
      Reviewed-by: Christian Kuhn
      Tested-by: Christian Kuhn
      d952d1dd
    • Jost Baron's avatar
      [TASK] Make the update-from-TER link more visible · 41ed02c9
      Jost Baron authored
      Make the "update from TER"-action in the extension manager more
      visible by showing a button for it, instead of a text link.
      
      Also moved the rendering functionality of the update link from
      a viewhelper to a partial, as partials tend to be more readable
      and bug free.
      
      Resolves: #46029
      Releases: 6.1
      Change-Id: If447bba28bc0dee3e7de286e1a93e062ef59843c
      Reviewed-on: https://review.typo3.org/18687
      Reviewed-by: Philipp Gampe
      Tested-by: Philipp Gampe
      Reviewed-by: Anja Leichsenring
      Tested-by: Anja Leichsenring
      Reviewed-by: Christian Kuhn
      Tested-by: Christian Kuhn
      41ed02c9
    • Philipp Gampe's avatar
      [BUGFIX] Handle symlink on extension update · 69391120
      Philipp Gampe authored
      If an extension is updated and the extension in the file
      system is a symlink to a different directory, all
      target directory contents is removed and the update fails.
      
      Introduce a check for symlink and just remove the
      symlink in this case.
      
      Resolves: #46158
      Releases: 6.1, 6.0
      Change-Id: I112ae7192fb0edf77ebd703a61804dc09ca506a4
      Reviewed-on: https://review.typo3.org/18826
      Reviewed-by: Christian Kuhn
      Tested-by: Christian Kuhn
      69391120
    • Philipp Gampe's avatar
      [TASK] More descriptive error message on file upload failure · f5401a11
      Philipp Gampe authored
      Provide the user with more accurate information about what might have
      gone wrong.
      
      Resolves: #46160
      Releases: 6.0,6.1
      Change-Id: I86123b904f36ff7f6db77f2dd13f97c0a01957c3
      Reviewed-on: https://review.typo3.org/18827
      Reviewed-by: Alexander Opitz
      Reviewed-by: Anja Leichsenring
      Tested-by: Anja Leichsenring
      Reviewed-by: Markus Klein
      Tested-by: Markus Klein
      Reviewed-by: Christian Kuhn
      Tested-by: Christian Kuhn
      f5401a11
  3. Mar 10, 2013
    • Francois Suter's avatar
      [BUGFIX] Correct check for extTables script · 0f7fe6be
      Francois Suter authored
      Existence of the script defined in TYPO3_extTableDef_script is
      currently achieved by using file_exists(). This is insufficient
      if TYPO3_extTableDef_script is defined, but empty, as
      file_exists() will match "typo3conf/" and try to include it.
      
      Resolves: #46161
      Releases: 6.0, 6.1
      Change-Id: I2e72e86bc583bf4a1ca7e570e679d8297963383d
      Reviewed-on: https://review.typo3.org/18828
      Reviewed-by: Francois Suter
      Tested-by: Francois Suter
      0f7fe6be
  4. Mar 08, 2013
    • Christian Kuhn's avatar
      [BUGFIX] Typo in sys_log TCA · 9be1dcb9
      Christian Kuhn authored
      Wrong table field name in sys_log TCA "detail_nr" instead of
      "details_nr" triggers SQL errors in DB check -> Full search module.
      
      Change-Id: I02298019ef29f38def0b6c204236fd6987b92bce
      Releases: 6.1, 6.0
      Fixes: #45887
      Reviewed-on: https://review.typo3.org/18811
      Reviewed-by: Christian Kuhn
      Tested-by: Christian Kuhn
      9be1dcb9
    • Christian Kuhn's avatar
      [TASK] Raise submodule pointer · 929a2c83
      Christian Kuhn authored
      Change-Id: I886c3e9cb3212d958b405e0ac9264c2ef9860171
      Reviewed-on: https://review.typo3.org/18810
      Reviewed-by: Christian Kuhn
      Tested-by: Christian Kuhn
      929a2c83
    • Georg Ringer's avatar
      [TASK] Don't render table header if no files given · fffe917e
      Georg Ringer authored
      It doesn't make sense to render the table header in
      the filelist module if no files are given.
      
      Change-Id: I81870bca94e63643e3f27c90efa370b0a9964337
      Resolves: #45579
      Releases: 6.1
      Reviewed-on: https://review.typo3.org/18362
      Reviewed-by: Felix Kopp
      Tested-by: Felix Kopp
      Reviewed-by: Soren Malling
      Tested-by: Soren Malling
      Reviewed-by: Wouter Wolters
      Tested-by: Wouter Wolters
      Reviewed-by: Christian Kuhn
      Tested-by: Christian Kuhn
      fffe917e
    • Markus Klein's avatar
      [BUGFIX] Wrong cmd example in INSTALL.txt · f54d1efb
      Markus Klein authored
      The INSTALL.txt file has an example on how to create a link
      in Windows using the MKLINK command.
      
      Unfortunately the parameters in the example have the wrong order.
      
      Resolves: #46119
      Releases: 6.1, 6.0, 4.7, 4.5
      Change-Id: Ida960d79e0144c15afdd7c21a9cd35466ec24545
      Reviewed-on: https://review.typo3.org/18806
      Reviewed-by: Christian Kuhn
      Tested-by: Christian Kuhn
      f54d1efb
    • Michael Stucki's avatar
      [BUGFIX] Fix SQL syntax · 3eda95d2
      Michael Stucki authored
      Use single quotes to retain compatibility with PostgreSQL.
      
      Change-Id: If3b900d08330bb96ce37fcbefcd110ccfd9b24b5
      Resolves: #45826
      Releases: 6.1, 6.0
      Reviewed-on: https://review.typo3.org/18475
      Reviewed-by: Felix Kopp
      Reviewed-by: Rico Sonntag
      Reviewed-by: Alexander Opitz
      Tested-by: Alexander Opitz
      Reviewed-by: Xavier Perseguers
      Tested-by: Xavier Perseguers
      Reviewed-by: Christian Kuhn
      Tested-by: Christian Kuhn
      3eda95d2
    • Anja Leichsenring's avatar
      [BUGFIX] Allow Setting colorspace in the Install Tool. · be4887e7
      Anja Leichsenring authored
      Some versions of Imagemagick (6.7.0 and above) use the sRGB colorspace
      instead RGB as before. This results in darker images after processing,
      because TYPO3 hardcoded the RGB colorspace in graphical functions.
      
      This patch introduces a setting in the GFX part of the Install Tool,
      lets the user choose the sufficient colorspace.
      This selection is used in graphical functions.
      
      Additionaly a hint on the setting was added to the Image Processing Test
      'Read Images' in the Install Tool.
      
      Fixes: #36597
      Releases: 6.1, 6.0, 4.7, 4.5
      Change-Id: I50a26c414705afa3177a2f12fc3bb4532c2d0f7f
      Reviewed-on: https://review.typo3.org/17474
      Reviewed-by: Christian Kuhn
      Tested-by: Christian Kuhn
      be4887e7
  5. Mar 07, 2013
    • Wouter Wolters's avatar
      [BUGFIX] Deactivating "install" extension leads to exceptions · 6c543d0c
      Wouter Wolters authored
      Uninstalling the "install" extension leads to exceptions in
      required system extensions like extensionmanager or lang.
      
      The solution is to make "install" a required extension too.
      
      Change-Id: Id5a0ebd9400648cd7c453d98b58e8cad1d155bd8
      Fixes: #43361
      Releases: 6.1, 6.0
      Reviewed-on: https://review.typo3.org/16824
      Reviewed-by: Markus Klein
      Tested-by: Markus Klein
      Reviewed-by: Sebastian Michaelsen
      Tested-by: Sebastian Michaelsen
      Reviewed-by: Oliver Klee
      Reviewed-by: Felix Kopp
      Tested-by: Felix Kopp
      Reviewed-by: Stefan Neufeind
      Reviewed-by: Christian Kuhn
      Tested-by: Christian Kuhn
      6c543d0c
    • Markus Günther's avatar
      [TASK] Fix deprecated things in sysnote · 524951cf
      Markus Günther authored
      The extension sysnote uses deprecated methods in the repository and
      the controller. This patch will adjust that.
      
      Fixes: #45349
      Releases: 6.1
      
      Change-Id: I7270efb264b80eb852ad972e8a492c0941e83be2
      Reviewed-on: https://review.typo3.org/18194
      Reviewed-by: Christian Kuhn
      Tested-by: Christian Kuhn
      524951cf
    • Stanislas Rolland's avatar
      [BUGFIX] RTE: Empty paragraphs are not correctly transformed · d07887a7
      Stanislas Rolland authored
      Problem: Empty paragraphs entered in the RTE may get lost on way to
      database if no block is found in content, as well as on way to the RTE
      if followed by a block.
      Solution: Fix both transformations and add multiple unit test
      cases.
      
      Releases: 4.5, 4.7, 6.0, 6.1
      Resolves: #36904
      Resolves: #26141
      
      Change-Id: I6c5495fb668f29267bcdeb7b44814a4bb9dc0f96
      Reviewed-on: https://review.typo3.org/11621
      Reviewed-by: Wouter Wolters
      Tested-by: Wouter Wolters
      Tested-by: Mario Rimann
      Reviewed-by: Mattias Nilsson
      Tested-by: Mattias Nilsson
      Reviewed-by: Christian Kuhn
      Tested-by: Christian Kuhn
      d07887a7
    • Felix Kopp's avatar
      [TASK] Flatten row-headers · 142cd978
      Felix Kopp authored
      Flattens the 3d gradient row-headers as discussed in UX team.
      Following the new page module column style.
      
      Change-Id: I4dea32d0e4ed021baa402559eeda91f9293b5abf
      Fixes: #43282
      Releases: 6.1
      Reviewed-on: https://review.typo3.org/18715
      Reviewed-by: Wouter Wolters
      Tested-by: Wouter Wolters
      Reviewed-by: Christian Kuhn
      Tested-by: Christian Kuhn
      142cd978
    • Andreas Kießling's avatar
      [BUGFIX] Clearing cache from toolbar fails in IE8 · cdd31cff
      Andreas Kießling authored
      Fix for regression in #45595 that was introduced with #36364
      IE8 does not pass the click event to the handler function and thus
      raises a JavaScript error. The event can be fetched from the window
      object in this case.
      
      Fixes: #45595
      Releases: 6.1, 6.0, 4.7, 4.6, 4.5
      
      Change-Id: I9ccd5c8ae660a34e404122d9dd1c816909688b3e
      Reviewed-on: https://review.typo3.org/18453
      Reviewed-by: Mattias Nilsson
      Tested-by: Mattias Nilsson
      Reviewed-by: Wouter Wolters
      Tested-by: Wouter Wolters
      Reviewed-by: Mario Rimann
      Tested-by: Mario Rimann
      Tested-by: Pascal Maechler
      Reviewed-by: Stefan Neufeind
      Reviewed-by: Christian Kuhn
      Tested-by: Christian Kuhn
      cdd31cff
    • Thorben Kapp's avatar
      [BUGFIX] pageNotFound_handling never happens · dd4df199
      Thorben Kapp authored
      The function \TYPO3\CMS\Core\Utility\RootlineUtility::getRecordArray
      throws a \RuntimeException that should be caught in
      \TYPO3\CMS\Frontend\Page\PageRepository::getRootline. If the exception
      is not caught, the page-not-found-handling is never triggered.
      
      Fixes: #44454
      Releases: 6.0, 6.1
      Change-Id: I3988b46ebaa8e479ed3c70017a5dda6bc5eaceac
      Reviewed-on: https://review.typo3.org/18558
      Reviewed-by: Thorben Kapp
      Reviewed-by: Tilo Baller
      Tested-by: Tilo Baller
      Tested-by: Thorben Kapp
      Tested-by: Vincent Mans
      Reviewed-by: Wouter Wolters
      Reviewed-by: Stefan Neufeind
      Tested-by: Christian Futterlieb
      Reviewed-by: Tomasz Krawczyk
      Tested-by: Tomasz Krawczyk
      Reviewed-by: Christian Kuhn
      Tested-by: Christian Kuhn
      dd4df199
    • Felix Kopp's avatar
      [TASK] Remove unused files: images & templates · 3f17d64a
      Felix Kopp authored
      Most images in typo3/gfx are not used anymore.
      Also several html templates are not in use any more.
      Removes few image and template files.
      
      Change-Id: Icb609e20a188e19df49aee9173f599af0f087d9a
      Fixes: #45785
      Releases: 6.1
      Reviewed-on: https://review.typo3.org/18455
      Reviewed-by: Soren Malling
      Tested-by: Soren Malling
      Reviewed-by: Christian Kuhn
      Tested-by: Christian Kuhn
      3f17d64a
    • Dmitry Dulepov's avatar
      [BUGFIX] ExtensionManagementUtility tries to include non-existing files · 56360eae
      Dmitry Dulepov authored
      Methods createExtLocalconfCacheEntry() and createExtTablesCacheEntry()
      attempt to include files without checking if they exist. This causes
      PHP warnings about non-existing files and looses time in a call to
      GeneralUtility::getUrl().
      
      Change-Id: Icbee0c8e6e9e0ada1dc48ac471006b6dc59adc6d
      Resolves: #46074
      Releases: 6.0, 6.1
      Reviewed-on: https://review.typo3.org/18757
      Reviewed-by: Christian Kuhn
      Tested-by: Christian Kuhn
      56360eae
    • Ernesto Baschny's avatar
      [TASK] Update copyright year to 2013 · e62b1c3c
      Ernesto Baschny authored
      Resolves: #46085
      Releases: 6.1, 6.0, 4.7, 4.6, 4.5
      Change-Id: I970078281d129be8ffef0bef128b23354ce59ddd
      Reviewed-on: https://review.typo3.org/18770
      Reviewed-by: Thomas Loeffler
      Tested-by: Thomas Loeffler
      Reviewed-by: Mattias Nilsson
      Tested-by: Mattias Nilsson
      Reviewed-by: Oliver Klee
      Reviewed-by: Markus Klein
      Tested-by: Markus Klein
      Reviewed-by: Christian Kuhn
      Tested-by: Christian Kuhn
      e62b1c3c
  6. Mar 06, 2013
    • Helmut Hummel's avatar
      [BUFIX] External URL regression by jumpurl security fix · e429270e
      Helmut Hummel authored
      With the jumpurl security fix, pages of type
      'Link to external URL' throw a jumpurl
      hash exception if called in the frontend. This typically
      happens if a HMENU renders such page links.
      
      The patch adapts the TSFE logic to write the required
      hash dynamically to _GET to make the jumpurl check happy
      that is called later on within the same process if
      calling such a 'external url' link.
      
      Change-Id: Ie73cd9710929c72aad4e75543f90c8618797997b
      Fixes: #46071
      Related: #28587
      Releases: 6.1, 6.0, 4.7, 4.6, 4.5
      Reviewed-on: https://review.typo3.org/18753
      Reviewed-by: Anja Leichsenring
      Tested-by: Anja Leichsenring
      Reviewed-by: Gregor Hermens
      Tested-by: Gregor Hermens
      Reviewed-by: Helmut Hummel
      Tested-by: Helmut Hummel
      e429270e
    • TYPO3 Release Team's avatar
      [TASK] Raise submodule pointer · 6b0b8c7c
      TYPO3 Release Team authored
      Change-Id: I40dc056b209f1105ea18b78a4700c62e14018b6f
      Reviewed-on: https://review.typo3.org/18740
      Reviewed-by: TYPO3 Release Team
      Tested-by: TYPO3 Release Team
      6b0b8c7c
    • Franz G. Jahn's avatar
      [SECURITY] Open redirection with jumpurl · 62a17a28
      Franz G. Jahn authored
      jumpurl allows redirect to any given URL. A hash on the url
      is now required to know if the jumpurl has been created
      by the system or by the outside.
      
      The hook "jumpurlRedirectHandler" can be used to allow
      redirects without hash or to custom redirects.
      
      Fixes: #28587
      Releases: 6.1, 6.0, 4.7, 4.6, 4.5
      Change-Id: I63da18b1963ec50cd95dd49d1669c9873b7bab54
      Security-Commit: ad62088840f78ed3947cfb9b66ef20d6d9760b69
      Security-Bulletin: TYPO3-CORE-SA-2013-001
      Reviewed-on: https://review.typo3.org/18734
      Reviewed-by: Oliver Hader
      Tested-by: Oliver Hader
      62a17a28
  7. Mar 05, 2013
    • Helmut Hummel's avatar
      [BUGFIX] Fix warning in adapter service · 036ed56d
      Helmut Hummel authored
      The merge of #45415 introduced a warning
      because the new meta column name was
      used as array key.
      
      Skip this step when the meta column
      is found to fix this issue.
      
      Fixes: #45415
      Releases: 6.1, 6.0
      
      Change-Id: I5446104359816d0ccacf6c239b86b9b073783174
      Reviewed-on: https://review.typo3.org/18700
      Reviewed-by: Helmut Hummel
      Tested-by: Helmut Hummel
      Reviewed-on: https://review.typo3.org/18701
      036ed56d
    • Helmut Hummel's avatar
      [BUGFIX] Do not overwrite imagecaption in content adapter · 8fe18b16
      Helmut Hummel authored
      Problem:
      Create a new content element of type file links,
      add a file relation and a description to this file.
      Switch this element to be an image element,
      add an image and a description of the image
      
      Expected result:
      An image with the image description is shown
      
      Actual result:
      An image with the description of the file is shown.
      
      Solution:
      Check if the field actually is shown in the selected
      content element type.
      
      Fixes: #45415
      Releases: 6.0, 6.1
      
      Change-Id: I3aa0e47b336cfa881c637b7f5a9e68476ded88ae
      Reviewed-on: https://review.typo3.org/18222
      Reviewed-by: Wouter Wolters
      Tested-by: Wouter Wolters
      Reviewed-by: Helmut Hummel
      Tested-by: Helmut Hummel
      8fe18b16
    • Helmut Hummel's avatar
      [BUGFIX] Fix inconsitency of file reference property getters · 79464927
      Helmut Hummel authored
      The FileReference object has the following getters
      for getting properties:
      
      getProperties()
      getReferenceProperties()
      getProperty($key)
      getReferenceProperty($key)
      
      The result from these getters is inconsistent:
      
      getReferenceProperty($key)
      Returns the value of a property which is only
      in the reference properties
      
      getReferenceProperties()
      Returns merged properties form the original
      file and the reference properties without
      respecting overriding of reference properties
      if they are not set to NULL
      
      getProperty($key)
      Returns the merged value from original file
      and reference, respecting the NULL override
      handling. But if a property is only available
      in the original file an Exception is thrown.
      
      getProperties()
      Returns merged properties form the original
      file and the reference properties
      respecting overriding of reference properties
      if they are not set to NULL
      Properties only available in the original file
      will be available in the resulting array.
      
      Streamline the behaviour so that all getters
      starting with "getReference" will only return
      the properties of the reference record and all
      other will return the merged properties but
      respecting the NULL override handling.
      
      Resolves: #45416
      Releases: 6.0, 6.1
      
      Change-Id: I35a84da83be765991b357c5cee89ce018a1f1e24
      Reviewed-on: https://review.typo3.org/18223
      Reviewed-by: Steffen Ritter
      Tested-by: Wouter Wolters
      Reviewed-by: Helmut Hummel
      Tested-by: Helmut Hummel
      79464927
    • Andreas Lingott's avatar
      [BUGFIX] Wrong usage of array_unique() · bb69e837
      Andreas Lingott authored
      RootlineUtility.php does not use return value of array_unique() call,
      which makes the call ineffective.
      
      This causes some huge SQL queries and increases page load time heavily.
      
      Resolves: #46000
      Releases: 6.1, 6.0
      Change-Id: Ic614a22a97927cc433eab9e5bf1b6125d53b5882
      Reviewed-on: https://review.typo3.org/18691
      Reviewed-by: Michael Stucki
      Tested-by: Michael Stucki
      Reviewed-by: Wouter Wolters
      Tested-by: Wouter Wolters
      Reviewed-by: Dmitry Dulepov
      Tested-by: Dmitry Dulepov
      bb69e837
  8. Mar 04, 2013
  9. Mar 03, 2013
  10. Mar 02, 2013
    • Felix Kopp's avatar
      [TASK] CGL ResourceStorage double quote · a0b62745
      Felix Kopp authored
      Brings a single CGL "DoubleQuoteUsageNotRequired" improvement.
      
      Change-Id: I7ca24279953e9d1566c6733cdcf29462e6bc5c2e
      Fixes: #45965
      Releases: 6.1
      Reviewed-on: https://review.typo3.org/18561
      Reviewed-by: Wouter Wolters
      Tested-by: Wouter Wolters
      Reviewed-by: Philipp Gampe
      Tested-by: Philipp Gampe
      Reviewed-by: Christian Kuhn
      Tested-by: Christian Kuhn
      a0b62745
    • Matthias Nitsch's avatar
      [BUGFIX] Extbase Plugin for Indexed Search not working · 2b9be5ae
      Matthias Nitsch authored
      The plugin uses wrong classes in several places, which leads to fatal
      errors because of missing functions.
      
      Replace all occurences with the right classes.
      
      Resolves: #45162
      Releases: 6.1, 6.0
      Change-Id: I446be223e48dc7fc6de78a6d17eb0b1923108409
      Reviewed-on: https://review.typo3.org/18020
      Reviewed-by: Philipp Gampe
      Tested-by: Philipp Gampe
      Reviewed-by: Matthias Nitsch
      Tested-by: Matthias Nitsch
      Reviewed-by: Wouter Wolters
      Reviewed-by: Stefan Neufeind
      Reviewed-by: Marc Hirdes
      Tested-by: Marc Hirdes
      Tested-by: André Haehnel
      Reviewed-by: Benjamin Mack
      Tested-by: Benjamin Mack
      2b9be5ae
  11. Mar 01, 2013
    • Anja Leichsenring's avatar
      [BUGFIX] Numeric check for upper/lower bound of flexform-values · bf60746f
      Anja Leichsenring authored
      The range-check in Flexforms uses the same code as for normal
      tables. Normally an integer field would be of type integer.
      But in Flexforms the value is a string as is the value in DS.
      
      Change-Id: I3512a961780a4bef91e04f61b8b9547f43f28f3e
      Fixes: #15771
      Releases: 4.5, 4.6, 4.7, 6.0, 6.1
      Reviewed-on: https://review.typo3.org/9022
      Reviewed-by: Wouter Wolters
      Tested-by: Wouter Wolters
      Reviewed-by: Anja Leichsenring
      Tested-by: Anja Leichsenring
      Reviewed-by: Georg Ringer
      Tested-by: Georg Ringer
      bf60746f