A start to fix draft handling
Merge branch 'master' into drafts
Draft refactoring
Merge branch 'master' into drafts
auto updated _media.html