Squashed 'vm/' changes from 8728a90..3983a42

3983a42 Fixing mediawiki
8d8071d Adding the mediawiki option
2458032 Add mediawiki to subtree.sh

git-subtree-dir: vm
git-subtree-split: 3983a423785eaaa963df1491eb1218de2fbdb38d
Merge commit '783f5c398649201f921d652f59b8184492b97c2e'

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Merge commit '5c3152859be15b3483770887a83bc81fa3d2e382'

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.