Make the notification handler optional (simplifies testing)
Formatting
Remove unused option keys
Only forward user name if user is non-null
Merge branch 'multiple-file-uploads'