Merge commit '0a9b5bbb47a965238ca0e1e699d61d7ddd054742' * commit '0a9b5bbb47a965238ca0e1e699d61d7ddd054742': Fix a media server crash (bug 1807910): part one
Merge commit '0a9b5bbb47a965238ca0e1e699d61d7ddd054742' * commit '0a9b5bbb47a965238ca0e1e699d61d7ddd054742': Fix a media server crash (bug 1807910): part one