fix bug in generation of spider media
Merge branch 'master' into RELEASE_20140325