Merge remote-tracking branch 'origin/punktetool' into punktetool

# Conflicts:
#	extension/qfq/qfq/database/DatabaseUpdateData.php

extension/qfq/qfq/database/DatabaseUpdateData.php

@@ -104,6 +104,7 @@ $UPDATE_ARRAY = array(
     ],
 
     '0.25.12' => [
+        "ALTER TABLE `FormElement` CHANGE `checkType` `checkType` ENUM('auto','alnumx','digit','numerical','email','pattern','allbut','all') CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT 'auto';",
         "ALTER TABLE `FormElement` CHANGE `label` `label` VARCHAR(511) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT ''",
     ],