apply patch from @patrickmarlier
Merge branch 'master' of github.com:splay-project/splay