Merge branch 'allowoverride' of https://github.com/michalsrb/tigervnc