Merge branch 'jk/mediawiki-credential'