Merge mapserver-power to mapserver-merge

It will break everything xD