don't allow downloading during preparation as its just confusing
Merge branch 'master' into testing