Merge branch 'escape-opts' of https://github.com/olivergondza/tigervnc