Merge remote-tracking branch 'mweinelt/tinc-gui' into 1.1