Merge branches 'patch-1' and 'patch-2' of https://github.com/jblaine/tigervnc