Merge two $wgExtensionFunctions

Change-Id: I8695446ae9f8aea56dcda4a0d6d5787e97d77217
Merge "Merge two $wgExtensionFunctions"