Fix for stupid ad blockers
Merge branch '2.0'