Merge branch 'bp/mediawiki-preview'