merge son-monitor update with upstream
merge son-monitor update with upstream

stevenvanrossem/son-emu,mpeuster/son-emu,stevenvanrossem/son-emu,stevenvanrossem/son-emu,mpeuster/son-emu,mpeuster/son-emu,mpeuster/son-emu,stevenvanrossem/son-emu