commit 7f62405ae12597e1ca83d69273645e2fc357cc99 Merge: bb3017b59 19f40f6d8 Author: Juergen Daubert <jue@jue.li> Date: Sun Oct 25 12:05:42 2020 +0000 Merge branch '3.5' into 3.6 Conflicts: kodi-addon-inputstream-adaptive/.footprint kodi-addon-inputstream-adaptive/.signature kodi/.signature open-vm-tools/.signature p5-datetime-timezone/.signature p5-params-util/.signature picard/.footprint picard/.signature python3-psutil/.footprint python3-psutil/.signature