tree 0fef8698c6c765512447959af7a346f4f4cdacf4
parent 8d8efe8922016124c851cf6985d9382d4ee9b96e
parent 9456b5cc0567ba999956caba4cfcf4d509bd25ae
author Jan Kundrát <jan.kundrat@cesnet.cz> 1571848274 +0200
committer Jan Kundrát <jan.kundrat@cesnet.cz> 1571848274 +0200

Merge changes 1870 and 1923

Change-Id: I259729999f5935368b05a9310535c6f294a5c7db