updated
updated
Merge ssh://github.com/barnabyg/fixclient