Media retrieval refactor; first pass
Merge branch 'master' into dev
A couple of voteskip fixes