Should fix #254 on server side, but does not work properly on client side
Merge branch 'master' of https://github.com/appsgate2015/appsgate