Merge branch 'maint' * maint: add missing && to submodule-merge testcase test-date: fix sscanf type conversion