Don't overwrite per-host user-data
Merge branch 'master' into skydock