Merge branch 'showdown-extensions'