Socket timeout on avatar problems is a warning
error->warning
Merge branch 'nightly'