Merge branch 'jn/mediawiki-makefile-updates'