Merge branch 'for-4.18-vsprintf-cleanup' into for-4.18