Handle intermittent network errors
Merge branch 'master' of github.com:Xenapto/xendata

Two-site development.