Merged modifications for Mediabrowser from Gotham-version into Helix-version