another missing merge from openvix/enigma2