Fix masterserver javascript: adjustable output id
Merge remote-tracking branch 'upstream/master'