adding the 'x' to the media type identifier
Merge branch 'master' into couple-child-relationship