Updated to work with Chromium positional tracking.
Merge branch 'master' into gh-pages