Merge branch 'w41_MDL-42054_m26_phpmailertesting_i' of https://github.com/skodak...