Merge branch 'mac_menu' of https://github.com/CendioOssman/tigervnc