Merge remote-tracking branch 'upstream/master'
Merge commit '87a5e487cb3f5eb465776debca7c4a59abb50ddc' into additional-media