Merge branch 'jk/avoid-mailto-invalid-in-doc'