Make relay not display empty part messages
Merge remote-tracking branch 'upstream/master'