Fixed disk detection in snapshot upload.
Merge branch 'test' into dev