Update mediawiki
Merge (resolve conflict)
Merge branch 'master' of github.com:didier13150/rpm

Merge
Merge branch 'master' of github.com:didier13150/rpm

Merge