GUACAMOLE-88: Re-apply fixes omitted from failed merge of pull request #17 (d5f3ea90a5f080db6ca73b3af241211980cb8d8a).
3 files changed