merge fixes from fhem-mirror