Merge pull request #1 from freddy77/master
Other pull request

Signed-off-by: Frediano Ziglio <frediano.ziglio@citrix.com>