Return by value.
Merge branch 'develop' of https://github.com/vrsys/guacamole into develop