Re-added load from master
Merge branch 'multiple-mediatypes' into github-refactor