DOCROOT contains DS
Merge pull request #502 from thomasedwards/1.6/develop

Upload class: DOCROOT contains DS