Fix conversion tables
Change default mercy border
Merge branch 'master' into gh-pages
Update builds