Travis ds bug - DO NOT MERGE

I'm investigating a problem with device storage when running on travis. So this pull request will contain lots of stuff which should never be merged.