Don't trim display name when it's null
Merge branch 'master' of https://github.com/icplayer/icplayer.git