Merge branch 'cmdline-crash' of https://github.com/twaugh/tigervnc