First patch in updating to mediawiki 1.23

Change-Id: I38e272136d167bed297a106e720d6259eb611f5b
Merge remote-tracking branch 'origin' into dev

Change-Id: I06dd996b8c9acee9dd4c58b61b8e2d83e367b1cf