Sort entries in "cpanfile" because otherwise pre-commit hook complains
Remove Git merge leftovers from SQL diff
Merge branch 'master' into compare_random_gridfs_and_s3_downloads