Fix contact form span.
Merge branch 'dev_yann' into shi