Merge branch 'merge-upstream'
Possible fix to mobile popover issue
Merge branch 'master' of https://github.com/TheWolfA2/thisis183 into gh-pages