Links are now redirecting to pop-ups with JS
Merge origin/master