Merge branch 'master' into delete-unused-DataImport.php

# Conflicts:
#	extension/qfq/qfq/utils/DataImport.php
1 job for delete-unused-DataImport.php in 1 minute and 45 seconds (queued for 2 seconds)