Merge remote-tracking branch 'MikeCol/extremetube-gay'