// fix emails not found when theme mails dir doesnt exist - array_merge(null, array) is null
Merge pull request #2171 from djfm/1.6

// fix emails not found when theme mails dir doesnt exist - array_merge(...