Merge branch 'system-wide-config' of https://github.com/jblaine/tigervnc