Fixing up some token issues
Merge branch 'master' into gh-pages
Rebuild